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

RE: svn merge question

From: Olivier DAVY <odavy_at_sopragroup.com>
Date: 2003-01-07 10:02:14 CET

Is this issue the same thing that the FreeBSD release teams explain :
""""
The next step is to create a branch point tag, so that diffs against the start of the branch are easier with CVS:
    /usr/src# cvs rtag -rRELENG_4 RELENG_4_4_BP src
And then a new branch tag is created with:
    /usr/src# cvs rtag -b -rRELENG_4_4_BP RELENG_4_4 src
"""
cf. http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/release-proc.html

It seems that they always tag a branch point (_BP) to find the starting point of the branch.

Olivier DAVY

-----Message d'origine-----
De: Rob Clark [SMTP:robdclark@mac.com]
Date: mardi 7 janvier 2003 09:50
A: Michael Wood
Cc: dev@subversion.tigris.org
Objet: Re: svn merge question

On Sunday, January 5, 2003, at 11:39 PM, Michael Wood wrote:

> On Sun, Jan 05, 2003 at 05:59:19PM -0800, Rob Clark wrote:
>> now I am trying to merge the changes back to the trunk by:
>>
>> 1) svn co https://.../trunk
>> 2) cd trunk
>> 3) svn merge https://.../trunk https://.../branches/OBJS1 .
>
> I have never used merge and have not read the book :) but I believe
> this
> should be:
>
> $ svn merge -r2:5 https://.../branches/OBJS1 .
>
> You don't want to merge the differences between trunk and the branch
> into your working copy (since trunk might have changed since you
> branched.) You want to merge the differences between the revision that
> you branched and the revision that you finished working on the branch
> into your working copy and then commit that to the trunk.
>
> Your command should still not segfault, though, and maybe it should
> even
> work if no changes have been made to trunk after rev 1.

in my case there were no changes on the trunk, but you bring up a
point... if there were changes on the trunk, how is a good way to
figure out the point where the branch was created for the purposes of
merging back to the trunk? It seems like this should be something
obvious... how can I view the version tree?

-- Rob

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jan 7 10:03:08 2003

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