Hi Ryan,
The command below does not cause a conflict. What you see below is the
exact output when running the command.
Thanks
Lakshman
> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2006c@ryandesign.com]
> Sent: Thursday, 24 August 2006 5:30 PM
> To: Lakshman Srilakshmanan
> Cc: Subversion List; Andrew Reedick
> Subject: Re: Evil twin bug ?
>
>
> On Aug 24, 2006, at 09:17, Ryan Schmidt wrote:
>
> >> Step 4 -- Merge Project B into trunk
> >> ------------------------------------
> >> scmop@maggie:~/sgs-trunk > svn merge
svn://lakshman@maggie/sgs/trunk
> >> svn://lakshman@maggie/sgs/branches/ProjectB
> >> D logo_tp.gif
> >> A logo_tp.gif
> >> D NantExample.build
> >> A NantExample.build
> >
> > Same here. You've asked to transform trunk (with is now the same as
> > Project A) into Project B, so you see it's deleting the files that
> > had been added from Project A, and replacing them with those from
> > Project B. Again, you need to merge just the revisions from Project
> > B that you want:
> >
> > scmop_at_maggie:~/sgs-trunk > svn merge -rB1:B2 svn://lakshman@maggie/
> > sgs/branches/ProjectB
>
> Oh, and I should note that at this point you will of course receive a
> conflict, since the merge will be trying to add files which already
> exist in the trunk, and you'll have to resolve that manually.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 24 10:39:25 2006