top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

Merging SVN repositories

+2 votes
406 views

I need to do copy the content from one SVN repository to the other SVN repositories. Also, I need to make sure that Bidirectional merges are working after I copy content from one SVN to other.

Does anybody know how to do that. I think we have a svnsync command to copy the contents from one svn to other. But I am not sure if this allows bidirectional merging or not or bidirectional merging is even possible or not.

posted Jan 22, 2014 by Bob Wise

Share this question
Facebook Share Button Twitter Share Button LinkedIn Share Button

1 Answer

+1 vote

You really can't keep 2 writable repositories in sync because subversion needs to strictly serialize transactions and the repository's global revision number. Depending on what you are doing, you might be able to set up a proxy that reads from the nearby repository but writes to the master - with svnsync duplicating the changes. Or, Wandisco has a commercial tool to do this across a larger number of locations.

Or, if groups at different locations normally work on different components of your project(s), you might split them into different repositories, using svn externals to pull everything together.

answer Jan 22, 2014 by Kiran Kumar
Similar Questions
+1 vote
Correct way to undo commit of a tag in SVN?

My most recent commit was the creation of a tag. I want to delete that tag. Should I reverse merge the commit or simply delete the tag?

If I do a reverse merge I see a tree conflict: 

C:>svn merge -c -69  

--- Reverse-merging r69 into '.': 

 C tagsTAG_ 

--- Recording mergeinfo for reverse merge of r69 into '.': 

U . 

Tree conflict on 'tagsTAG_ 

 > local dir edit, incoming dir delete upon merge 

Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:

What is the best thing to do here?

+5 votes
Can svn merge --record-only be applied multiple times on a revision number?

Are there side effects from applying the same svn merge --record-only on the same revision number and a new commit each time it is applied ?

Would there be issues with SVN mergeinfo and/or SVN in general if one keeps applying svn merge --record-only on a revision number repeatedly and commit in a svn merge --record-only followed by commit followed by svn merge --record-only followed by commit and the next cycle begins ? Its not an infinite loop svn merge; it would stop at some point.

+1 vote
svn mergeinfo and svn merge

We are using 1.6 SVN. We like to svn merge from our branch A to trunk.We have been diligent in svn merge from trunk to A.These svn merges from trunk to branch A also include --record-only merges too, in addition to regular merges. Development on branch A has stopped.Now we like to merge branch A to trunk using --reintegrate option.B ut we dont know what to expect if using this option fails on us.

1) Suppose svn merge --reintegrate fails on us on a working copy that has all the mergeinfo list information. Could we perform a clean co of branch A into another working copy and then perform svn merge --reintegrate to trunk there ? Will we get more conflicts simply because the new working copy doesnt have the mergeinfo list like the first working copy of branch A ? Will this plan B work ?

2) How do we resolve conflicts during svn merge --reintegrate process ? Would you share the steps for us to make the merge go smoothly ?

3) Is mergeinfo a global or local property ? it seems that whenever a new checkout is done, mergeinfo list matches up with other working copies of the same branch.

+2 votes
Svn merge that deletes files fails with svn

While merging branch back to trunk I constantly get the error in the subject. Note that x/y/z has svn:mergeinfo property. The property was not added on the branch, but it was already there when the branch was created. Subsequently x/y/z is deleted on branch.

The error is generated when running: "svn merge ^/branches/mybranch" on a trunk working copy.

Sounds to me like a bug, svn tries to update the mergeinfo on the deleted path. Is that so ?

+2 votes
merge issue - files not updated because of svn commits fail

We are using svn 1.6 - we tried merging from Trunk to a feature branch using svn merge (automatically). We just found out that some files are not updated with the merges but mergeinfo has already indicated and ci with the messages that those files are merged. We like to perform svn merge again using the same revision number from the trunk to the feature branch would svn refuse simply because it was merged "successfully" before ?

Are there side effects in applying svn merge again on the same revision numbers from the mergeinfo property ?

...