Re: Resolve callback - ideas?

Alexander Klenin wrote:
> On 9/5/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
>> My question: should TSVN make use of that callback? And if yes, how
>> should we best implement this (GUI wise)?
>> I don't like the idea of having an operation interrupted until the user
>> reacts to some dialog asking to resolve a conflict if that can be done
>> after the operation is finished - but maybe you have better ideas?
>
> IIUC, the usage of callback is, unfortunately, required to support
> multi-range merge.
> See e.g. http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=128091
>
> So while it is indeed inconvenient to the user,
> it may be the only way to avoid double-conflicts.
> It would be nice callback implementation to postpone all conflicts
> except actual doubles, but I have no idea whether it is possible.
> Another similar but less effective option is to first try a merge with
> conflict postponing, and if that fails due to double conflict, re-run
> with interactive callback.

Ok, I'll implement this for merge operations only. It currently is only
used for updates, switches and merges anyway. And updates/switches don't
have 'multiple' merges which require resolving the conflicts during the
operation but can work just fine with resolving the conflict later.

Now I need some help:
What should the dialog look like?

There need to be buttons for:
edit conflict (launches TortoiseMerge)
open (opens the conflicted files "theirs, mine, base" in the default
application)
use mine
use theirs
resolved (button only active after TortoiseMerge has been launched)

and of course two buttons:
resolve later
resolve all later

Your creativity is required now. Please send in your suggestions on what
the dialog should look like, text of the buttons, layout, ...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org