Re: [TSVN] Re: feature request, sort of

Simon Large wrote:

>
>>The menu option for "Resolved Conflicts" is very close to the menu
>>option for "Edit Conflicts". As I was describing these to my
>>co-worker, he accidentally clicked "Resolved" instead of "Edit".
>>Clearly, there is a problem here, since it did not ask for
>>confirmation nor does there seem to be a way to get back to the
>>previous state where one could easily edit conflicts.
>
>
> This is a very good point. I have almost been caught out by that before
> because "Edit conflicts" and "Resolve conflicts" sound similar and get mixed
> up in my head sometimes. A confirmation dialog on resolve would be a very good
> idea.

Already in my TODO folder.

>>The other request is for 3-way TMerge to permit the menu option "Use
>>this text block" even on areas that aren't conflicted; just like the
>>ordinary 2-way view allows.
>
> That's a good idea too. How easy is it to implement?

That too. But I haven't got the time to figure out the amount of work
for that yet. May take some time...

Stefan

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