svndump - How to update svn properties (mergeinfo) and comments when repositories need to be combined and restructured (incl. remove files, rename folders)? -


initial situation

hi, have 2 original repositories, both have merged and updated:

repository 1

"old code" (orginal cvs, converted via cvs2svn)
layout of repo 1 (viewed svn angle):

/trunk
/branches
/tags

with having development in trunk, using feature branches , merge back, tagged versions -> fine
last source version between 1.0 , 1.1 , in /trunk.

repository 2

"new code", branches aren't correct (see explanation below) , many auto generated files (for example makefiles , intermediate c sources generated flex)

rev 1: add complete source version 1.1, it's on /, not on /trunk.
rev 2: add /trunk /branches /tags , moves source /trunk belongs to.
rev 3: add svn-ignore properties in folders
rev 4: created tag
rev 5: moved /trunk /trunk/sources, adding folder /trunk/stuff deleted later , should not part of new repo
next revs change version 1.x in /trunk/sources
rev 67: add /branches/version2
other revs done in /branches/version2.

goal

i try combine these repositories, remove unused stuff /trunk/stuff, rename /trunk/sources /branches/version_1.x , /branch/version2 /trunk. all while updating mergeinfo , if possible log messages.

this i've tried far

  1. using cvs2svn convert repo1
  2. using svnadmin dump repo1
  3. using svnadmin dump repo2
  4. optional changes
  5. using svnadmin create create new repo
  6. using svnadmin load import both
  7. using svnadmin dump new repo
  8. using svndumpfilter on repo2.dmp remove unused stuff, preferably --renumber-revs
  9. reload repo

it's not possible combine repos without step 4 repo2 starts adding "everything again" , in wrong place.

to working i've changed repo2.dmp manually notepad++ before importing it:

  • manually removed rev2
  • changing rev1 have changes @ /trunk not on /

this lead new , "working" repository after step 6 svn mergeinfo in repo2 not correct longer still uses old revision numbers (getting worse when excluding empty revisions in step 8).

i've tried change new_repo.dmp partly manual, parts search-and-replace regexp (in case via notepad++) , can fix parts renaming (/trunk/sources /branches/version_1.x , /branch/version2 /trunk) - fixing rev numbers in log messages , svn mergeinfo isn't possible way.

summarized question

is there option update / recreate repository correct (higher) revision numbers in svn mergeinfo, maybe in svn commit messages (they refer other revision numbers "fixed bug x introduced rev123")? there tools / tricks / tipps use renaming folders without manual regexp changes dump?

thank thoughts , answers!

check question , answer. in comments can find simple examples rewrite history.


Comments

Post a Comment

Popular posts from this blog

powershell Start-Process exit code -1073741502 when used with Credential from a windows service environment -

i'm running strange behavior powershell start-process call. here call: $process = start-process ` "c:\somepath\mybinary.exe" ` -passthru ` -credential $defaultcredential ` -wait ` -workingdirectory "c:\somepath" ` -loaduserprofile if ($process.exitcode -ne 0) { #do } this call return exit code - 1073741502 . after quick search, exit code seems related generic error when program not load required dll (aka. status_dll_init_failed ). when run without -credential $credential program runs correctly. in order isolate problem, manually launched some.exe in prompt target credential , runs smoothly. so problem seems come way start-process cmdlet launch process. i found potential solutions problem tried apply no luck : link , link . would have idea of what's going on here ? edit 1: run proc mon monitoring program activities when launched directly or via powershell script. problem seems occur when loading kernelbase
Read more

twig - Using Twigbridge in a Laravel 5.1 Package -

i'm trying create laravel 5.1 package uses twigbridge instead of .php views. can normal .php views display fine, when try make use of .twig templates i'm met error. possible use twigbridge templates when creating views laravel package or pretty stuck blade , php ? edit 1: loading twig template without extending works. it's when start using {% extends 'file' %} error comes out. i error error loading /virtual/laravel/packages/username/mypackage/src/views/sample.twig: template "templates.master" not defined () in "/virtual/laravel/packages/username/mypackage/src/views/sample.twig" @ line 1. my folders username |_ mypackage |_ src |_ controllers - samplecontroller.php |_ views |_ templates - master.twig - sample.twig twig template sample.twig {% extends 'templates.master' %} {% block content %} {{ parent()
Read more

c# - LINQ join Entities from HashSet's, Join vs Dictionary vs HashSet performance -

i have hashset's each stores t, have written test application compares different relation algorithms can think of, i'm not pleased results getting. does there exist more efficient ways of achieving object relations, once testing? using system; using system.collections.generic; using system.linq; using system.text; using system.threading.tasks; using system.diagnostics; namespace linqtests { class program { static void main(string[] args) { hashset<user> usertable = new hashset<user>(); hashset<userproperty> userpropertytable = new hashset<userproperty>(); #region lets create dummy data. console.writeline("please wait while creating dummy data, can take while..."); console.writeline(""); int rows = 1000000; for(int x = 0; x < rows; x++) { random rnd = new random(); // ad
Read more