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

merge with tree conflict

From: Vadym Chepkov <chepkov_at_yahoo.com>
Date: Tue, 29 Sep 2009 15:56:08 -0700 (PDT)


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


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

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.