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

Re: Odd merge conflicts

From: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2005-01-02 06:46:34 CET

On Jan 1, 2005, at 11:30 PM, Christopher Ness wrote:

> On Sat, 2005-01-01 at 23:12 -0500, Scott Palmer wrote:
>> I tried again with:
>>
>> svn -rB:HEAD svn://blah/trunk
>
> Off by one error? Did you try to merge the changes in revision B twice
> into your branch with the above command? Perhaps...
>
> svn -r{B+1}:HEAD svn://blah/trunk

I thought about that. The merge is basically applying the diff between
the supplied revisions is it not? So -r1:2 would merge the changes to
go from rev 1 to rev 2, and -r2:3 would merge the changes to go from
rev 2 to rev 3. Right?

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 2 06:48:51 2005

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