| commit | ad19d8a760fc689b18003567283cf1a4b8e809cc | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 25 Oct 2013 09:55:53 +0000 (25 02:55 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Fri, 25 Oct 2013 10:02:15 +0000 (25 03:02 -0700) | ||
| tree | 6a431a45922393e91d41aa413a694d524c6742f2 | treesnapshot (tar.gz zip) |
| parent | 1af564f2a013ddeb47a3ba64cd28a5133afe23c3 | commitdiff |
models.main: exit amend mode when merging
Detect when we've somehow a state where we're amending and in the middle
of a merge. Reset the mode back to "none" when this happens.
This can happen if the user enters "amend" mode and then merges a
branch, either through the UI or via the command-line. We now avoid
this undesirable state by automatically disabling the "amend" mode when
an update detects that we are in the middle of a merge.
Signed-off-by: David Aguilar <davvid@gmail.com>
Detect when we've somehow a state where we're amending and in the middle
of a merge. Reset the mode back to "none" when this happens.
This can happen if the user enters "amend" mode and then merges a
branch, either through the UI or via the command-line. We now avoid
this undesirable state by automatically disabling the "amend" mode when
an update detects that we are in the middle of a merge.
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/models/main.py | diffblobblamehistory |