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

symfony - TEST environment only: The database schema is not in sync with the current mapping file -

there similar questions regarding issue haven't seen in particular test environment , sqlite. cannot validate schema test environment uses sqlite can validate schemas dev environment uses mysql. know reason , possible solution? whole application works fine in both dev , test environments though. phing , ci build broken. php app/console doctrine:schema:update --force --env=test updating database schema... database schema updated successfully! "9" queries executed php app/console doctrine:schema:validate --env=test [mapping] ok - mapping files correct. [database] fail - database schema not in sync current mapping file. update i'm adding sqldump result see if spots wrong it. thing can is, have 2 bundles. country below coming frontendbundle user entity missing defined in backendbundle . php app/console doctrine:schema:update --dump-sql --env=test drop index uniq_5373c9665e237e06; drop index uniq_5373c966d1f4eb9a; create temporary table __temp__country se...
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

jdbc - Not able to establish database connection in eclipse -

i want make new database connection (db2) in eclipse purpose of using jpa. in jpa perspective, in data source explorer view, when try create new db connection, receive following logs when try ping server. org.eclipse.datatools.connectivity.exceptions.dbnotstartexception: no start database command issued. errorcode = -4499, sqlstate = 08001. @ org.eclipse.datatools.enablement.ibm.db2.internal.luw.jdbcluwjdbcconnection.getconnectexception(jdbcluwjdbcconnection.java:74) @ org.eclipse.datatools.connectivity.ui.pingjob.gettestconnectionexception(pingjob.java:81) @ org.eclipse.datatools.connectivity.ui.pingjob.run(pingjob.java:63) @ org.eclipse.core.internal.jobs.worker.run(worker.java:54) caused by: com.ibm.db2.jcc.am.ro: [jcc][t4][2043][11550][4.8.87] exception java.net.connectexception: error opening socket server example.example.com/51.37.93.117 on port 50,000 message: connection timed out: connect. errorcode=-4499, sqlstate=08001 @ com.ibm.db2.jcc.am.gd.a(gd.j...
Read more