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

Re: Revision numbers in merge ?

From: Tim Hill <tim_at_realmsys.com>
Date: 2005-04-01 05:14:34 CEST

yes, I was referring to that. If it's an undoc feature at present, then
that's probably why it didn't make sense to me :)

Ben Collins-Sussman wrote:

> On Mar 31, 2005, at 7:46 PM, Scott Palmer wrote:
>> I think Tim was referring specifically to item #3 from 'svn help
>> merge'. You've covered #1, basically #2 is the same, and part of #3,
>> but #3 clearly shows "[@REV]" in addition to "-r N:M". How would you
>> use the @REV in the context of usage #3?
> It's for the new 'peg-rev' syntax in svn 1.1 for tracing renames.
> svn merge -rX:Y URL@Z working-copy
> This command means: "Jump to coordinates (Z, URL), then trace history
> backwards to find the same object in revisions X and Y -- which may
> have had a different names in those revisions. Then compare the
> old-names of URL in revision X and Y."
> Yes, I'm painfully aware that the peg-rev stuff isn't yet in the
> book. :-/

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 1 05:17:15 2005

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.