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

Re: Confusion over the 3 merge forms

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-11-19 20:03:12 CET

On Nov 19, 2004, at 12:30 PM, Stefan Haller wrote:
>
> Uhm. I am confident that you probably know what you are doing, but I'd
> like to warn people that this exact recipe is dangerous: if someone
> manages to commit things to the trunk between your last merge of the
> trunk into your branch and the final merge back, then you are going to
> revert those changes.
>
> To avoid that, the last command should be
>
> $ svn merge trunkURL@Y branchURL
>
> where Y comes from the last 'svn merge -rX:Y trunkURL' into your
> branch.
>

Totally agree. I just left out the details. :-)

Before merging my branch back to trunk, I'd run 'update', discover a
revnum close to HEAD. Then I'd merge trunk changes to branch (using
that specific revnum), then compare trunk and branch together (using
that specific revnum).

In general, it's kinda bad to use HEAD when merging. Too imprecise.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 19 20:05:50 2004

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