[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: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2004-02-09 06:06:34 CET

On Sun, 08 Feb 2004 22:29:53 -0600, "Ben Collins-Sussman"
<sussman@collab.net> said:
> On Sun, 2004-02-08 at 22:08, Francois Beausoleil wrote:
> 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.

Haha ! This is a case where I should have asked for:
svn merge -r 2:head trunk branches/temp

True ? If so, I think I've finally understood merging correctly. Phew !
 After 12 months, it's about time :)

Bye !
Developer of Java Gui Builder

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 9 06:06:57 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.