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

Re: [BUG] Merge does not pick up svn copy WC URL

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-02-09 05:29:53 CET

On Sun, 2004-02-08 at 22:08, Francois Beausoleil wrote:

> Should the final merge have picked up fileB.java ? In my opinion, yes.

No, there's no bug here.

> svn merge --revision 2:head file:///repos/branches/temp

Look at your merge command. You're asking the server to compare two
trees: (2, /branches/temp) and (3, /branches/temp). What's the
difference between those two trees? Answer: the addition of fileC.
That's it. Both trees *already* have fileB.

Therefore, merge is doing exactly what you ask: it's adding fileC.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 9 05:33:52 2004

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.