Make compare more functional
Observe that diff is generated properly, however there are no commits to display. they show up when using ?merge=1 param.
That's a regression and in such way it's not very usable to not seen a commits between a branch and a tag.
Should we always use merge flag ?
#1 Updated by Daniel D about 3 years ago
The interesting thing is that commits will show for some comparisons with merge=0, eg:
We can probably force compare on same repo to use merge=1, this means we are expecting a common ancestor, actually in some weird cases 2 commits can not share same ancestor - so this is not good either.
#4 Updated by Daniel D about 3 years ago
These tag comparisons show what happens when 2 refs had commits in one not the other:
- compare b4 to b5 merged 7 commits in b5 not in b4
- compare b5 to b4 merged 1 commit in b4 not in b5
- compare b4 to b5 unmerged - 14 files changed: 61 inserted, 181 deleted
- compare b5 to b4 unmerged - 14 files changed: 181 inserted, 61 deleted
The way the logic worked before, I have a feeling our compare with merge=0 did not show 8 commits, only 7
#6 Updated by Marcin Kuzminski [staff] about 3 years ago
- Target version changed from v4.1 to v4.2
- Subject changed from regression: using compare losts ability to show commits to Make compare more functional
So we identified it's actually not a regressions. We discussed it with Dan, and think we should improve the UI to be able to decide if you want to view this as merge or not.
Probably a checkbox checked by default would be a good start + some text explaning how the diffs are different
#14 Updated by Redmine Integration over 2 years ago
Commit 8e9f93ec94b2 by Marcin Kuzminski email@example.com on default branch references this issue. https://internal-code.rhodecode.com/rhodecode-enterprise-ce/changeset/8e9f93ec94b2214b5c48738fd3af551a41e2b5ef
#15 Updated by Redmine Integration over 2 years ago
pullrequest merged by marcink (status: approved). https://internal-code.rhodecode.com/rhodecode-enterprise-ce/pull-request/2833