Wish: offer quick way to directly revert attempted merge

Hi! I'm using TortoiseSVN 1.8.8 - 64Bit.

I find that SVN automatic merge is still not perfected, in the sense that I often have to try a few different variants (automatic/reintegrate/partial) before I end up with a successful merge.

By successful I mean one where only relevant conflicts happen, and not any spurious (tree) conflicts due to misinterpreted mergeinfo/ancestry.

Mostly the problems occur after merging back and forth a couple of times between two branches.

Thus, I often end up doing something like:
1. Merge, (Cancel), Revert.
2. Merge, (Cancel), Revert. (Doh!)
3. Merge, Resolve, Commit. (Phew!)

Therefore, it would be nice to have a way to quickly revert everything from inside the Merge status dialog. I'm suggesting a "Revert All" button that is disabled during an ongoing merge but can be pressed (instead of "OK") after the merge is finished/failed/canceled. This button should probably ask for confirmation when pressed.

Alternatively, the "Cancel" button could offer the choice to revert everything, provided that "Cancel" is not disabled when the merge is finished.

(NOTE: Our SVN server runs SVN 1.8.5 and things might improve a bit if we upgrade the server to 1.8.10, but a "Revert All" button would be nice to have in the merge status dialog anyway.)

Best regards,
Göran Wallgren

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-09-17 11:48:33 CEST