[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: Mon, 10 Nov 2008 20:20:40 +0100

Mark Phippard wrote:
> On Mon, Nov 10, 2008 at 2:12 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> During the last few days I've implemented some UI in TSVN to help the
>> user to detect and resolve tree conflicts. But I found that an 'svn
>> resolve treeconflictedfile' does nothing. Looking through the code I can
>> see that this is not yet implemented.
>> Now I've seen talk about branching 1.6 this week. Would that mean that
>> resolving tree conflicted files won't work in 1.6? If not, what would I
>> have to do to mark such a conflicted file as resolved?
> It is in the TO-DO as a blocker.
> http://svn.collab.net/repos/svn/trunk/TODO-1.6

Thanks - I've only checked the notes/tree-conflicts folder for info,
I'll make sure to look for a TODO file next time.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-11-10 20:21:09 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.