merge with tree conflict

Hi,

Could you help me to solve the problem I have, please?

I have loaded a new vendor drop using svn_load_dirs.pl and I can see all changes using svn diff ^/vendor/product/1.2 ^/vendor/product/current

Now I want to merge these changes into my working copy. The problem is, in a working copy I have one of the directories removed and when I try to merge I get a tree conflict.

svn merge ^/vendor/product/1.2 ^/vendor/product/current .

--- Merging differences between repository URLs into '.':
   C install
Summary of conflicts:
  Tree conflicts: 1

$ svn st
 M .
! C install
> local delete, incoming edit upon merge

How can I skip the deleted directory changes and apply only the remaining changes? Thank you.

Sincerely yours,
  Vadym Chepkov

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2401812

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 02:24:31 CEST