How to merge SVN transactions?

How do I take a series of commits in my SVN repository and merge them?

For example, there are versions 4-10 in the repository, and I want to merge them into a new revision 4 containing all the changes in the previous 4-10.

I don't want to interrupt existing tags that were created with SVN copy.

This is because the storage was previously in ClearCase and the Polarion migration tool left a huge number of single files that needed to be cleaned up.

+1


source to share


4 answers


You can branch in version 3 and merge revisions 4-10 into branch



+4


source


Reading between the lines, take a look at svk , which should allow you to start a local repository and then commit a series of changes right away to the main repository.



+2


source


You can't do this without creating a new repository, so it's best to just deal with it.

If you really need to do this, you can probably do it with "svnadmin dump" and "svnadmin load".

Edit: If you just want to push commits out of the trunk history but are fine with them while staying elsewhere in the repository, then something similar to Manu's suggestion is a workable solution: rename the trunk to old_trunk, copy the revision before the range you want to merge into the trunk, then combine the range changes and commit.

+1


source


If you really need to do this, check each revision (not a single-file commit) from ClearCase and then manually copy the files over the new SVN checker using a tool like WinMerge to make sure all file additions and deletions are copied as well as changes. Then execute the SVN transaction.

If this is too much manual work due to the amount of ClearCase compilation (although you could probably automate this without too much difficulty), then consider doing major SVN changes manually (e.g. point releases).

If this is not possible, consider not reporting the changelog from ClearCase - just start with SVN. Perhaps copy the old changelog text file from ClearCase for historical purposes so that if someone needs to go back and get the old code they can figure out which revision to look for.

+1


source







All Articles