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

Re: [TSVN] Resolved button in TortoiseMerge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-13 23:25:46 CEST

Josha Foust wrote:
> The "Marked as resolved" button gets enables as soon as you change the
> file it is displaying (via the context menu), even when it is just being
> used as a diff viewer/editor. It should only enable when it is being
> used to edit conflicts, correct?
>
> I'm seeing this in r3877.

Should it also be disabled while there are still conflicts remaining?
You can save the file while there are still conflicts, but I don't think
you should be able to mark as resolved so easily. You can always do that
from the main context menu if you really want to leave some conflict
markers in there.

Simon

-- 
        ___
   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
Received on Wed Jul 13 23:25:04 2005

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