flatten sub-branch merge and keep rebase merge in diff branch view
Currently, when showing diff branch view in branch (task) with many sub-branch (sub-task) and some rebase, all merge are grouped under
"Merged from cs:##@br:{source branch name} : # items"
This is useful for rebase merge because when I diff a branch, I want to see what changes were made in the branch and having rebase changes hidden under this group is good.
However, grouping of sub-branch merge is defeating the purpose of diff parent branch. Most often, when I diff a parent branch, I want to see changes as flat changes, regardless of which sub-task the changes from.
![](https://secure.gravatar.com/avatar/7795f0b98309f176f7d111919812bd88?size=40&default=https%3A%2F%2Fassets.uvcdn.com%2Fpkg%2Fadmin%2Ficons%2Fuser_70-6bcf9e08938533adb9bac95c3e487cb2a6d4a32f890ca6fdc82e3072e0ea0368.png)
We consider it completed after http://codicesoftware.blogspot.com/2015/02/using-history-to-better-explain-branch.html
-
Please check http://codicesoftware.blogspot.com/2015/02/using-history-to-better-explain-branch.html and let us know if it helps or not.
-
psantosl commented
We're about to release new improvements in 'item-merge-tracking' that precisely affect how we show branch and cset diffs. Stay tuned because it will happen this week.