[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 15:07:50 CET

On Mon, 09 Feb 2004 07:52:39 -0600, "Ben Collins-Sussman"
<sussman@collab.net> said:
> On Sun, 2004-02-08 at 23:06, Francois Beausoleil wrote:
> > >
> >
> > Haha ! This is a case where I should have asked for:
> > svn merge -r 2:head trunk branches/temp
>
> No, I don't think that will do anything at all. If you compare (2,
> /trunk) with (3, /trunk), there's no difference. Those two trees are
> identical, so there's no diff to apply to your working copy.
>

I understand your message. I did not write the proper command, so you
did not understand what I meant. The actual command that should have
been written was:

K:\wc\trunk>svn merge file:///repos/trunk_at_2
file:///repos/branches/temp_at_head

This says "apply the differences between trunk@2 and branches/temp@head
to .". Right ?

Thanks,
François
Developer of Java Gui Builder
http://jgb.sourceforge.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 9 15:08:28 2004

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