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

Re: More strange merge conflicts.

From: David Summers <david_at_summersoft.fay.ar.us>
Date: 2005-07-30 17:31:43 CEST

On Sat, 30 Jul 2005, Ben Collins-Sussman wrote:

> On Jul 29, 2005, at 3:35 PM, David Summers wrote:
>
>>
>> While on the branch I did a "svn merge -rLAST_WEEKLY_MERGE+1:HEAD
>> URL_OF_TRUNK".
>
>
> This is your mistake. If you first run
>
> svn merge -r 50:100 trunkURL
>
> ...and then two weeks later, run
>
> svn merge -r 101:200 trunkURL
>
> ...then the change made in r101 is never merged! You've skipped a revision.
> And this is why you're getting conflicts further down the road. Your second
> merge command should have been -r 100:200.
>
>

OK, Thanks, I'll have to expiriment with that I guess.

The reason I did the LAST_WEEKLY+1 was because the LAST_WEEKLY was the
number of the last weekly commit itself (hopefully that makes sense).
I.E., I originally did svn merge -r 1:99 URL_OF_TRUNK and committed that
as r100 on the branch, then later I did svn merge -r 101:199 URL_OF_TRUNK.

Therefore it seems that it wouldn't make a difference because that commit
was not to trunk but to the branch, so I'm not sure how that could affect
a subsequent merge from the trunk to the branch.

But, I'll try that next time and see if that resolves the wierd conflicts
I've been getting.

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 30 17:33:29 2005

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