On Aug 24, 2006, at 10:05, Lakshman Srilakshmanan wrote:
>> On Aug 24, 2006, at 09:17, Ryan Schmidt wrote:
>>
>>>> Step 4 -- Merge Project B into trunk
>>>> ------------------------------------
>>>> scmop_at_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.
>
> The command below does not cause a conflict. What you see below is the
> exact output when running the command.
I understand that the command you listed, which is incorrect, will
not produce a conflict; it will do what I described, which is not
what you want to do. However the command I listed, which is the one
you need to use, will produce a conflict, for the reasons I stated.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 24 11:21:54 2006