[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: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2005-07-30 23:38:01 CEST

On 30-Jul-05, at 11:31 AM, David Summers wrote:

> 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.

The merge command merges the changes that were made *starting with*
one revision to get to another revision.
In you example above, what changes were made to get from r100 to
r101? In your case it would be ok to skip the commit to trunk, but
you are also skipping that the next commit after it. It probably
isn't worth the effort to try to skip commits that happen on an
unrelated branch, since they won't be included in the branch you are
merging anyway.

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 30 23:39:14 2005

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