can i merge with a working copy *and* a URL?

  some inconsistency between docs on "svn merge". from "svn help
merge":

$ svn help merge
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]

  this suggests that i can't merge when one of my sources is a source
URL, and the other is a WC source path. is that true?

  meanwhile, the book complete reference page reads:

"Synopsis

svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
svn merge -r N:M SOURCE [PATH]"

which doesn't seem as restrictive. or is it? bit of a disagreement
here.

rday

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 20 12:34:03 2004