Mercurial > hg
changeset 7734:9f73bddb9d0b
reset mergestate after commit
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Thu, 25 Dec 2008 10:42:01 +0100 |
| parents | 30e95eafc1d0 |
| children | edcb56991afe |
| files | mercurial/commands.py tests/test-resolve tests/test-resolve.out |
| diffstat | 3 files changed, 38 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Jan 28 14:27:44 2009 -0600 +++ b/mercurial/commands.py Thu Dec 25 10:42:01 2008 +0100 @@ -645,6 +645,9 @@ elif ui.verbose: ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) + ms = merge_.mergestate(repo) + ms.reset(node) + def copy(ui, repo, *pats, **opts): """mark files as copied for the next commit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-resolve Thu Dec 25 10:42:01 2008 +0100 @@ -0,0 +1,27 @@ +#!/bin/sh + +# test that a commit clears the merge state. + +hg init repo +cd repo + +echo foo > file +hg commit -Am 'add file' -d '0 0' + +echo bar >> file +hg commit -Am 'append bar' -d '0 0' + +echo % create a second head +hg up -C 0 +echo baz >> file +hg commit -Am 'append baz' -d '0 0' + +echo % failing merge +HGMERGE=internal:fail hg merge + +echo resolved > file +hg resolve -m file +hg commit -m 'resolved' -d '0 0' + +echo % resolve -l, should be empty +hg resolve -l
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-resolve.out Thu Dec 25 10:42:01 2008 +0100 @@ -0,0 +1,8 @@ +adding file +% create a second head +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head +% failing merge +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +use 'hg resolve' to retry unresolved file merges +% resolve -l, should be empty