Re: resolving tree conflicts

Julian Foad wrote:
> On Mon, 2008-11-10 at 20:20 +0100, Stefan Küng wrote:
>> 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.
>
> Stefan,
>
> Also note that the present "svn resolved"/svn_client_resolved() can
> resolve tree conflicts: if invoked on a directory, it resolves all tree
> conflicts that have that directory as their parent directory.
>
> That's not what we want so we're changing it to resolve just the one
> tree conflict of which the target is the victim.

Thanks for the info. I'll wait for the changes first. Only if those
changes don't make it into 1.6, I'll change the TSVN UI accordingly,
although it will be difficult to come up with an UI so users don't get
confused: resolving a conflict by resolving *all* conflicts in that same
folder is not easy explained.

Stefan

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