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

Re: merging

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-02-17 00:23:49 CET

On Feb 16, 2006, at 23:40, Kevin Aubuchon wrote:

> To merge my branch to trunk: svn merge trunk_url @ rev#
> branch_url @ rev#. No, I didnít type that backwards. The
> directory to receive the changes is my trunk working copy directory.
>
> Is this how others are merging , or do I misunderstand?

Not only will that apply the changes made in the branch to the trunk
working copy, it'll also undo any changes that were made only in the
trunk. I'm guessing that's not what you want. More usual I think
would be

svn merge -rA:B branch_url

where A is the revision where the branch was created (or the last
revision of the branch from which you merged before, if you've merged
before) and B is the HEAD revision, or the most recent revision of
the branch you want to merge.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 17 00:37:20 2006

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