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

Sanity check: rev number for subsequent merges.

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-07-24 21:36:51 CEST

One of my users is getting strange merge results, so it's dumb question

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?


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. 162

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 24 21:38:40 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.