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

Should 1.5.6 merge help be updated?

From: anatoly techtonik <techtonik_at_gmail.com>
Date: Mon, 2 Mar 2009 21:46:27 +0200

"merge: Apply the differences between two sources to a working copy path.
usage:
       ...
       3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]

...

  3. In the third form, SOURCE can be either a URL or a working copy
     path (in which case its corresponding URL is used). SOURCE (in
     revision REV) is compared as it existed between revisions N and M
     for each revision range provided. If REV is not specified, HEAD
     is assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M'
     does the reverse: '-r M:<M-1>'. If no revision ranges are
     specified, the default range of 0:REV is used. Multiple '-c'
     and/or '-r' instances may be specified, and mixing of forward
     and reverse ranges is allowed."

Should there be a clarification that If no revision ranges are
specified, the default range is not "0:REV", but "BRANCH-POINT:REV"
and only if there is no BRANCH-POINT, 0:REV is used?

The page at http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync
mentions that "Subversion is aware of the history of your branch and
knows when it divided away from the trunk." and that means it will use
branch point if it's available.

-- 
--anatoly t.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1257875
Received on 2009-03-02 20:46:44 CET

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

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