CODEWITHSUNDEEP
svnmergebranch
Just a guy
Just a guy

Reputation: 5912

SVN Merging Complication

I've done a bit of research, and seem to find answers just about 4 inches off the mark for my situation.

We've got an SVN set up that currently has a third party continually developing on a different branching. Periodically we need to draw in their progress.

To start, we had them sync up with our trunk to draw in out changes and resolve any potential conflicts by running:

svn merge url/to/trunk

Now, we are trying to pull back in from them. However, svn doesn't seem to know that the last merge was from trunk.

When we run:

svn merge url/to/third/party/branch

on our trunk checkout, it's attempting to reapply the same changes, resulting in a huge number of "local add, incoming add upon merge".

Is there something I'm missing? What would be the proper way to draw in the changes since the last merge and have SVN know about changes that started in trunk?

Also, is this the correct process we should be using to draw in changes they make as we require the updates?

Upvotes: 0

Views: 208

Answers (2)

William
William

Reputation: 3529

Try passing the --reintegrate flag to the merge back in to trunk

http://blogs.collab.net/subversion/2008/07/subversion-merg/ (good link on merging with reintegrate as recommended by @doc_180)

Upvotes: 2

billygoat
billygoat

Reputation: 21984

Before, I put in my 2 cents. Please let me know if you find out, how to perform merging in SVN seamlessly.

If you are performing large number of merges in SVN, then you could use the SvnMerge.py library. This helps in automation of most of the merging use cases.

This is pasted from their FAQ?

What problem does svnmerge solve?

If we have to apply the same change to another branch, subversion already has a method for doing this. Traditional subversion will let you merge changes, but it doesn't "remember" what you've already merged. It also doesn't provide a convenient way to exclude a change set from being merged. svnmerge.py automates some of the work, and simplifies it. Svnmerge also creates a commit message with the log messages from all of the things it merged.

This tool did help me with Merging in SVN. But I eventually found Git much better than SVN, when we have to perform frequent merges. (and hence the request to share your findings)

Upvotes: 0

Related Questions