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

Re: Tree Conflict actions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 08 Nov 2008 23:38:40 +0100

Joel Low wrote:
> Hello,
>
>
>
> I’m not clear what actions can be done in TSVN when a tree conflict
> occurs. Are there any to begin with? The only way to resolve them now
> (that I can see) is to use the svn command line client.

tree conflicts and handling them will be available in the next release.
They're not available in the command line client either (unlsess you're
using one built yourself from the Subversion trunk).

I hope to have some tree conflict resolving implemented by tomorrow
(it's almost midnight here), but you'll have to use a nightly build to
get it.

Also, resolving tree conflicts on files doesn't work right now. I don't
know yet when this will be implemented in the svn library, but I guess
it will be soon.

Stefan

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

Received on 2008-11-08 23:39:19 CET

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