Merging + Deletes?

[Mike Howarth <Mi...@mamasandpapas.com>]

Hi 

I was wondering if anyone can help me.

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?

Mike Howarth




**********************************************************************
This email transmission is confidential and intended solely for the addressee. 
 
If you are not the intended recipient you must not copy, distribute, disclose or disseminate the information. If you have received this e-mail in error please do not open any attachments and delete this email as soon as possible.
 
Any view in this email are those of the sender only and not those of Mamas and Papas.
 
Emails passing through the company's network may be monitored or recorded under the Telecommunications (Lawful Business Practices) and (Interception of Communications) Regulations 2000. This email has been checked for viruses, however it is not guaranteed to be virus free. It is your responsibility to scan the message and attachment prior to opening them. We do not accept any responsibility for any damage rising out of any bug or virus infection.
**********************************************************************
This email has been scanned by the MessageLabs Email Security System.
For more information please visit http://www.messagelabs.com/email

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging + Deletes?

[Ryan Schmidt <su...@ryandesign.com>]

On Sep 5, 2006, at 18:23, 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.



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org