The automatic merge commit message needs to be cleared after commit
Created originally on Bitbucket by chphilli (Chris Phillips)
The THG 3.0 release includes an improvement of "commit: automatically set merge commit message", which is a great feature, but it doesn't properly clear itself after the merge is committed which can lead to accidental incorrect messages.
Steps to reproduce:
- Update to branch "a"
- Merge with branch "b"
- Commit the merge ( text is automatically "Merge with b" ). It doesn't matter if this is during the merge dialog/wizard, or committed separately.
- Observe: the commit message is still set to "Merge with b", even if you move on to something else.
Taking this further:
- Select "Close current branch"
- Observe that the commit message is still "Merge with b" rather than "Close a branch".
This seems to be that because the message box has text in it, changing the branch action doesn't automatically set the closing message anymore.