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

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

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-12-20 15:19:30 CET

On Dec 20, 2004, at 5:30 AM, Robert P. J. Day wrote:

> 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.

The book is out-of-date. It's displaying syntax from an older version
of svn. But: that restriction has always existed, I believe. The new
'svn help merge' is just more explicit about describing it.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 20 15:23:48 2004

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.