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

Re: resolving tree conflicts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 15 Nov 2008 14:08:12 +0100

On Sat, Nov 15, 2008 at 13:59, Stefan Küng <tortoisesvn_at_gmail.com> wrote:

> I'm using r34217 of the svn trunk.
> I have a test wc set up with several tree conflicts. Since the resolving
> branch has been merged back to trunk, I wanted to finish the conflict
> resolving in TSVN, but I seem to miss something - maybe I don't
> understand the concept.
> Merging a revision range from a branch back to trunk, with 'file' being
> removed on the branch but with local modifications in the wc. This of
> course leads to a tree conflict:
> Tree conflict:
> The merge attempted to delete 'file',
> or attempted to rename it.
> Either you have edited 'file' locally, or it has been edited in the
> history of the branch you are merging into, but those edits are not
> present on the branch you are merging from.
> Now, I like to resolve this conflict. Using
> $ svn resolve file --accept theirs-full
> I expected the file to get removed, since that was what the merge
> attempted to do. But the file just gets the tree conflict state removed.
> Is this how it is supposed to work?

Never mind - just saw the other thread about tree conflict resolving.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
Received on 2008-11-15 14:08:26 CET

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

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