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

resolving tree conflicts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 10 Nov 2008 20:12:09 +0100


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?


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

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