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

Bug: Missing feedback in Resolve Dialog

From: Marcel Samek <msamek_at_gmail.com>
Date: Fri, 10 Feb 2012 09:53:41 -0800 (PST)

I did a merge on a large project and had quite a large number of conflicts to deal with. Among those conflicts was a set of files that had been modified but the merge was now deleting them.

They all show up in the dialog with status "normal, tree conflict".

If I choose "edit conflicts" from the context menu on one of those files, I correctly get a popup which says that the file had been edited but the merge is trying to delete it and gives me an option to remove the file or keep the file.

I select "remove". And that leads me to the following issues that I noticed:

1) Once "remove" is selected, there is absolutely no feedback as to what happens. The popup dialog goes away but the file shows up in the Resolve dialog unchanged. I would expect it either to disappear (since I just told it how to resolve the conflict), or to show some modified status that indicates that I have operated on it.

2) If I select "edit conflicts" from the context menu on that file again (since I wasn't sure that the first operation did anything because it gave me no feedback), nothing happens at all. I get no popup, I get no error message, I just get a silent fail. Either it should not let me select "edit conflicts" on a file that has been resolved, or give me a message that says what happened.

3) If I select multiple files from that tree conflict list, and then select "edit conflicts" from the menu, I get the popup and can select "remove the file" but in reality it only operated on one file, not all the ones I had selected. Since there was no feedback in the panel (point 1 above) it is hard to tell which file was resolved and which wasn't. It would be great to be able to resolve multiple files that way, but if it is not going to let me do that, then the contex menu when I have multiple files selected should have the option grayed out.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-10 18:54:29 CET

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