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

A little improvement to the "merge" dialog

From: Zibetti Paolo <paolo.zibetti_at_sisal.it>
Date: Tue, 17 May 2011 15:17:52 +0200

If a conflict arises while performing an update of my working copy, the
last line in the dialog box states, in red:
"One or more files are in a conflicted state".
After I resolve all the conflicts from within the "update" dialog, the
above red line disappears. This is a very handy feature because when
that line disappears you know that you have resolved all the conflicts.

A similar dialog is displayed when performing a "merge-reintegrate",
but in this case the red sentence "One or more files are in a conflicted
state" doesn't disappear even after you resolve all the conflicts (al
least on my TSVN 1.6.14, 32 Bit on WinXP)

I think it would be a good idea to have the merge dialog to behave like
the update dialog.
What do you think about it ?

Bye

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2738901

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-17 15:18:00 CEST

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