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

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

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-07-27 23:53:04 CEST

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.

If I modify a file in r2, then update my WC to r1 and try to re-merge
r2, I get either a "Skipped missing target: 'rho'" or "Cannot replace
a directory from within" error (depending on whether I specify the
path to the directory containing the file in question as an argument
to 'merge', or specify the file itself).

I'm attachinga patch to the 1.4.x line which adds a -- failing as
noted above -- test for this behavior.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

  • application/octet-stream attachment: patch
Received on Fri Jul 27 23:45:20 2007

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