[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-04-01 02:45:00 CEST

On Mar 31, 2005, at 6:32 PM, Tim Hill wrote:

> Hi, I'm just coming up to speed on svn, after an age in many other SCC
> systems (but not CVS). Yes, I've rtfm, but still have this question...
> 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 #?
> The on-line docs say "This URL in revision REV is compared as it
> existed between revisions N and M. If REV is not specified, HEAD as
> assumed." which doesn't enlighten me much???

'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


    $ svn merge -r A:B URL working-copy

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