Add "unrelated merge" indicator in 2D history and filtered branch explorer
When viewing changeset history I tend to think about changesets in terms like "that is the checkin where I merged/rebased from /other_branch". That kind of context is sometimes lost in the Plastic views:
In 2D History if a merge is unrelated to the selected item then the merge arrow is not displayed.
In Branch Explorer if the /other_branch is hidden by filter, the merge arrow is not displayed.
Not displaying the merge arrow in these cases is logical since the /other_branch is unrelated or hidden. However, I'd find it helpful to have some kind of (optional) visual indicator that an incoming merge is part of a changeset that is already displayed. (This should not affect the "Display only relevant changesets" option.)
Perhaps you could render the incoming end of a merge-arrow and make it "fade away" or become "dotted" further away. Or display a special arrow icon to indicate the non-displayed merge. It would help bring the displayed changesets into context.
Also, the "View history" and Changesets views could benefit as well from having different icons for each changeset line depending on whether there's an incoming (or outgoing?) merge etc. As it is, the icons in these list views are not really used to their full potential since they are all the same...
-
Göran Wallgren commented
Actually, if I bring up the 2D history tree for a directory to see what changes are done to items in its subtree it does not show merge arrows for merges that involve items inside the relevant subtree. This makes it harder to follow what happened.
For example, I can see "C" changesets on a child branch and then later a "C" changeset on the main branch where the comment on the latter says it was merged back from the child branch, but there is no merge arrow displayed.
Therefore I strongly wish for an option to display even (seemingly?) "unrelated" merge arrows, BUT only for the changesets that are already shown - NOT as in the option "Display all merges in history" which is frankly rather useless to me.
-
Göran Wallgren commented
This uservoice is related to the following, and would be a good-enough solution to it as well:
https://plasticscm.uservoice.com/forums/15467-general/suggestions/12374433-in-2d-history-of-a-directory-show-merge-arrows-th -
Göran Wallgren commented
Moved the icon suggestion into a new uservoice:
https://plasticscm.uservoice.com/forums/15467-general/suggestions/13068252-make-better-use-of-the-icons-in-history-and-change -
While we evaluate this, what about taking a look into this? http://codicesoftware.blogspot.com/2014/10/how-2d-version-tree-works.html
-
Göran Wallgren commented
Here is a forum discussion that led up to this suggestion:
http://www.plasticscm.net/index.php?/topic/1741-merge-not-displayed-neither-in-file-history-nor-in-file-2d-history/