[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Evil twin bug ?

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-08-24 09:29:34 CEST

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.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 24 09:30:55 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.