> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2007a@ryandesign.com]
> Sent: vendredi, 23. mars 2007 06:13
> To: Felix Gilcher
> Cc: Darin Kelkhoff; Chris.Fouts@qimonda.com;
> users@subversion.tigris.org
> Subject: Re: unexpected conflict merging branch into trunk
> (after merging trunk into branch)
>
>
> On Mar 22, 2007, at 09:11, Felix Gilcher wrote:
>
> > merge svn+ssh://mldev/TRAINING/branches/test_merge svn+ssh://mldev/
> > TRAINING/trunk /path/to/trunk/working/copy
> >
> > I might be wrong on the order of the urls, always have to
> try wether
> > it's trunk first or branch first :). You might want to use
> -- dry-run
> > :)
>
> It's correct the way you've written it. It's always merge
> <FROM_URL> <TO_URL> <WC_PATH>. (merge creates a diff from
> <FROM_URL> to <TO_URL> and applies it to <WC_PATH>)
>
Yes, and precisely, it's not correct...
It should have been:
svn merge svn+ssh://mldev/TRAINING/trunk svn+ssh://mldev/TRAINING/branches/test_merge /path/to/trunk/working/copy
(svn merge trunk branch trunk_workspace)
as the goal is to merge the branch features on the trunk, so the diff must be branch "minus" trunk.
Regards
Christophe
> --
>
> To reply to the mailing list, please use your mailer's Reply To All
> function
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 23 10:02:46 2007