[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-07-30 17:21:31 CEST

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.

---------------------------------------------------------------------
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:23:23 2005

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