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

Re: Sanity check: rev number for subsequent merges.

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-07-25 12:42:40 CEST

On Jul 24, 2006, at 21:36, Reedick, Andrew wrote:

> One of my users is getting strange merge results, so it's dumb
> question
> time:
>
> First merge: merge -r 100-150 source_url
>
> Now, if the source_url was next modified in revision 160 (there
> were no
> 151-159 changes affecting the source_url) is the subsequent merge:
> svn merge -r 151:HEAD source_url, or
> svn merge -r 160:HEAD source_url?

If the next change after 150 was made in 160, then either

svn merge -r 151:HEAD source_url

or

svn merge -r 159:HEAD source_url

would be fine.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 25 12:43:52 2006

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