[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: Scott Palmer <scott.palmer_at_2connected.org>
Date: 2005-04-01 03:46:28 CEST

On Mar 31, 2005, at 7:45 PM, Ben Collins-Sussman wrote:

> On Mar 31, 2005, at 6:32 PM, Tim Hill wrote:
>> ...
>> The on-line help for the merge command shows:
>> svn merge -r N:M SOURCE[@REV] [WCPATH]
>> What I can't figure out is what is the use of "@REV" in the source?
>> merge already has two revision numbers (N and M) for the operation,
>> so what does it do with this third rev #?
>> ...
> 'svn merge' needs two repository trees to compare, and a working copy
> to receive the resulting patch.
> So you can run
> $ svn merge URL1@X URL2@Y working-copy
> or
> $ svn merge -r A:B URL working-copy

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?

merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
        2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
        3. merge -r N:M SOURCE[@REV] [WCPATH]

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 1 03:48:56 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.