Show More
@@ -645,9 +645,6 b' def commit(ui, repo, *pats, **opts):' | |||
|
645 | 645 | elif ui.verbose: |
|
646 | 646 | ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
|
647 | 647 | |
|
648 | ms = merge_.mergestate(repo) | |
|
649 | ms.reset(node) | |
|
650 | ||
|
651 | 648 | def copy(ui, repo, *pats, **opts): |
|
652 | 649 | """mark files as copied for the next commit |
|
653 | 650 |
@@ -824,8 +824,11 b' class localrepository(repo.repository):' | |||
|
824 | 824 | "(see hg resolve)")) |
|
825 | 825 | wctx = context.workingctx(self, (p1, p2), text, user, date, |
|
826 | 826 | extra, changes) |
|
827 |
r |
|
|
828 |
|
|
|
827 | r = self._commitctx(wctx, force, force_editor, empty_ok, | |
|
828 | use_dirstate, update_dirstate) | |
|
829 | ms.reset() | |
|
830 | return r | |
|
831 | ||
|
829 | 832 | finally: |
|
830 | 833 | del lock, wlock |
|
831 | 834 |
@@ -14,9 +14,10 b' class mergestate(object):' | |||
|
14 | 14 | def __init__(self, repo): |
|
15 | 15 | self._repo = repo |
|
16 | 16 | self._read() |
|
17 | def reset(self, node): | |
|
17 | def reset(self, node=None): | |
|
18 | 18 | self._state = {} |
|
19 |
|
|
|
19 | if node: | |
|
20 | self._local = node | |
|
20 | 21 | shutil.rmtree(self._repo.join("merge"), True) |
|
21 | 22 | def _read(self): |
|
22 | 23 | self._state = {} |
General Comments 0
You need to be logged in to leave comments.
Login now