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

Re: Merging + Deletes?

From: Ryan Schmidt <subversion-2006c_at_ryandesign.com>
Date: 2006-09-06 13:37:11 CEST

On Sep 6, 2006, at 10:12, Mike Howarth wrote:

>>> I currently have a number of development branches - dev/stage/live
>>>
>>> When I delete a directory from the 'dev' branch, once I merge the
>>> 'dev' and 'stage' branches the directory I have deleted is skipped
>>> in the 'stage' branch.
>>>
>>> Am I missing another svn tool which would sync the branches more
>>> completely? Or should I be looking at something like svk?
>>
>> Sounds like you may be using the merge command incorrectly. Show us
>> the exact merge commands you execute and maybe we can help straighten
>> this out.
>
> I'm simply running:
>
> Svn merge svn://repos/branch/dev svn://repos/branch/stage
> c:\dev\branch\stage

Right. That is not how the merge command is used.

Here is an explanation I wrote last week:

http://svn.haxx.se/users/archive-2006-09/0006.shtml

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 6 13:39:24 2006

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