merge related improvements for pending changes view
After performing a merge it would be useful if the pending changes had some merge specific content:
1) show which files were merged entirely automatically and which required manual intervention. Currently the 'Status' column shows "Replaced / Merge from ..." or "Checked-out / Merge from ...". I'm guessing the replaced corresponds to files that only changed on the source and checked out is for both manual and automatic merges?
2) Provide menu items for comparing the merged file (workspace revision) to one of: base, source, destination. Currently "Diff revisions..." defaults to the last but does not make it easy to find the other two.
When the merge fails to build, it can be quite hard to work out where it has gone wrong. During the merge the main window is disabled, making it hard to use context in selecting a merge contribution (eg. view the .cpp revisions when merging the corresponding .h)
robl
shared this idea
-
Göran Wallgren
commented
I agree. For a pending merge changelist, indicate which files had manual conflict edits applied so you can re-check your conflict resolution before checkin (without being cluttered by fully-auto-resolved files).
-
psantosl
commented
Really good points! I voted up for it too! :-)
-
robl
commented
Another way to facilitate 2) would be to allow "Diff selected changesets" between the checkout changeset and any other in branch explorer. Currently there are no context menus when this changeset and another is selected.
-
robl
commented
Alternatively the "Merge from" view could be left populated after the merge rather than clearing it (just disable the "process" button, but possibly add an "undo" one), and the column and compare menus added there.