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

UI Bug?

From: <matt.cormier_at_medavie.bluecross.ca>
Date: Wed, 28 May 2014 12:45:16 -0300

Hello all,

Yes, I joined the list to file a bug. This issue is a subtle user
interface issue, and if you also consider it an issue it is low priority
because there is a work around.

Bug description

When merging lots of code, many conflicts can arise. Before testing the
merge these conflicts need to be resolved. This can be done by right
clicking on the root directory and choosing TortoiseSVN -> Resolve ...

A dialog window similar to the one below will appear. Let's call this the
resolve dialog.

In the resolve dialog you can right click on a file and do stuff to merge
files. The UI subtly is in
relation to the OK and Cancel buttons. Let's say you manually resolve
several files, should
you hit the Cancel button or the OK button?

1. Clicking cancel does not undo any right click merge stuff. It is safe
to click cancel, it won't
cancel what you already did.

2. Clicking OK can mark everything resolved if you don't understand this
interface completely.
I believe the Select/ deselect

Summary
Resolve dialog UI not clear, you can easily accidentally mark all
conflicts as resolved when you do mean to do that.

Workaround
Avoid the resolve dialog. Use svn status and grep for conflicts to get a
list of the current conflicts. Use another tool to resolve the conflicts
or manually dig into the directories and resolve the conflicts one at a
time.

Anyway, I don't have a quick fix for this. There may even be things that
I have misunderstood or another tool/option that I can use instead of this
dialog that I am not aware of. Basically I hit that OK button
accidentally once and was burned. I thought I'd share my trepidation with
the tortoiseSVN team and see what you think.

Matt Cormier
-----------------------------------------------------------------------
This communication, including any attached documentation, is intended only for the person or entity to which it is addressed, and may contain confidential, personal, and/or privileged information. Any unauthorized disclosure, copying, or taking action on the contents is strictly prohibited. If you have received this message in error, please contact us immediately so we may correct our records. Please then delete or destroy the original transmission and any subsequent reply. Thank you.

La présente communication, y compris toute pièce qui y a été jointe, est destinée uniquement à la personne ou à l’entité à laquelle elle a été adressée, et contient des renseignements à caractère confidentiel et personnel. Toute diffusion ou reproduction non autorisée ou toute intervention entreprise relativement à son contenu est strictement interdite. Si vous avez reçu ce message par erreur, veuillez nous le signaler immédiatement afin que nous puissions effectuer la correction à nos dossiers. Veuillez par la suite supprimer ou détruire le contenu de la transmission originale ainsi que toute réponse ultérieure. Merci.
-----------------------------------------------------------------------

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

picture
Received on 2014-05-28 19:10:57 CEST

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