Merging a topic in a merge request soft fails (regression)
Any merge request will soft fail: merge happens on the repository, but Heptapod thinks it didn't merge.
This is a regression.
Steps to reproduce
- Create a repo, clone it,
cd
into it - Make a commit, then a second commit in a topic, then push
echo initial>initial
hg add initial
hg commit -m initial
hg topics merge-test
echo merge>merge
hg add merge
hg commit -m merge-test
hg push
- Create a merge request for that new topic
- Click the Merge button on the merge request
Expected behavior
Merge happens, the merge request gets the merged status.
Actual behavior
After some lag, merge happens, source branch is removed as expected, but:
- it says an error:
Something went wrong during merge: Conflicts detected during merge.
- the merge request status is still open
- in merge request list, a warning icon shows
Cannot be merged automatically
when hovered (expected since source branch is removed).