[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Svn diff and merge don't seem to work for me.

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-10-22 23:03:51 CEST

On Oct 22, 2005, at 02:11, Jim Lynch wrote:

> However I still don't understand the reason the merge doesn't work
> correctly.

It probably does work correctly, but maybe not the way you expect. :-)

I don't come from a CVS background like you do, so maybe you're
having a different confusion than I did. But for me, the important
concept to grasp is that a merge operates on three things: it takes a
differente between two things, and applies the difference to a third

For example, if you have trunk and a release branch called branch1,
and you've made a change on trunk in revision 51, and now you want to
back-port that change to branch1, you need to have a working copy of
branch1, and then you do this:

svn merge -r50:51 $REPO/project/trunk /path/to/working/copy/of/branch1

It creates a set of instructions necessary to convert revision 50 of
trunk into revision 51 of trunk, and then performs those instructions
on the working copy of branch1. Then you test it locally, and finally
commit it, stating in your commit message that you performed a merge
of revision 51 of trunk.

If you're already in the working copy of branch1, you can omit the
path at the end:

cd /path/to/working/copy/of/branch1
svn merge -r50:51 $REPO/project/trunk

There are other possible syntaxes for svn merge for different
situations, but the general idea is always the same.

If that's still not clear, show us the commands you're executing, and
what you wanted to achieve, and we can probably help you rewrite the
command so that it will do what you want.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Oct 22 23:05:59 2005

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.