Re: resolving tree conflicts

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
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org