Discussion on change in different merge request may be lost in changes view
Summary
Discussion on changes may lose association with a merge request when a force push occurs. The discussion remains correctly visible in the discussion panel, but vanishes from the changes view. Curiously, it is removed from the merge request concerning the branch which was not force-pushed.
Steps to reproduce:
- Create two branches, based on each other:
o D (branch-b)
|
o C
|
o B (branch-a)
|
o A
|
o master
- Create two merge requests for
branch-a
(MR1) andbranch-b
(MR2) - Discuss changes from A in MR1
- Discuss changes from C in MR2
- Rebase and force-push as follows:
o B (branch-a) o D (branch-b)
| |
o A o C
| ________________/
|/
o master
Expected Result:
- "Discussion" Panel of MR2 contains Discussion of C
- "Changes" Panel of MR2 contains Discussion of C
- "Discussion" Panel of MR1 contains Discussion of A
- "Changes" Panel of MR1 contains Discussion of A
Actual Result
- "Discussion" Panel of MR2 contains Discussion of C
- "Changes" Panel of MR2 contains Discussion of C
- "Discussion" Panel of MR1 contains Discussion of A
- "Changes" Panel of MR1 does not contain any discussion.