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

Re: merging/branches practices

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-03-08 21:42:09 CET

On 3/8/06, Vincent Starre <vstarre@comcast.net> wrote:

> When you are certain you want a complete sync:
> (first, merge branch changes into trunk, then...)
> $ cd branch_wc
> $ svn merge repos/branch repos/trunk .
> (here examine changes with svn diff to be sure you aren't squashing any
> branch changes you forgot to merge back to trunk)
> $ svn ci

This is actually not what you want to do. This will make your trunk
working copy look exactly like your branch, and any changes that were
made on the trunk since you initialy branched will be lost. You want
something like this:

$ svn merge -rREV1:REV2 branch_url .

Where REV1 is the last time you merged from that branch (or the
initial revision that created the branch if you've never merged from
it) and REV2 is the last revision on the branch you want to merge
(probably HEAD).

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 8 21:43:42 2006

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