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

Re: 'svn merge -cN wcpath' uses wcpath's URL for source and wcpath for target?

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-07-28 21:41:53 CEST

On 7/27/07, Daniel Rall <dlr@finemaltcoding.com> wrote:
> Mike, I'm been unable to produce the old merge behavior you described
> today on IRC, which a wcpath argument to merge is used to derive both
> the source URL and used for the merge target (http://paste.lisp.org/
> display/45224), with a 1.4.x client. Perhaps I'm misunderstanding
> the steps to reproduce, though.

This is not universally true; it's only true if wcpath is a single
file. I wrote this case way back in 'svn merge', before we released
svn 1.0.

That is, if I run 'svn merge -rX:Y wcfile', it will compare wcfile@X
with wcfile@Y, and apply the diff to wcfile (rather than applying it
to the usual default '.' target.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 28 21:40:32 2007

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