Show More
@@ -0,0 +1,27 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | ||||
|
3 | # test that a commit clears the merge state. | |||
|
4 | ||||
|
5 | hg init repo | |||
|
6 | cd repo | |||
|
7 | ||||
|
8 | echo foo > file | |||
|
9 | hg commit -Am 'add file' -d '0 0' | |||
|
10 | ||||
|
11 | echo bar >> file | |||
|
12 | hg commit -Am 'append bar' -d '0 0' | |||
|
13 | ||||
|
14 | echo % create a second head | |||
|
15 | hg up -C 0 | |||
|
16 | echo baz >> file | |||
|
17 | hg commit -Am 'append baz' -d '0 0' | |||
|
18 | ||||
|
19 | echo % failing merge | |||
|
20 | HGMERGE=internal:fail hg merge | |||
|
21 | ||||
|
22 | echo resolved > file | |||
|
23 | hg resolve -m file | |||
|
24 | hg commit -m 'resolved' -d '0 0' | |||
|
25 | ||||
|
26 | echo % resolve -l, should be empty | |||
|
27 | hg resolve -l |
@@ -0,0 +1,8 b'' | |||||
|
1 | adding file | |||
|
2 | % create a second head | |||
|
3 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
4 | created new head | |||
|
5 | % failing merge | |||
|
6 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
7 | use 'hg resolve' to retry unresolved file merges | |||
|
8 | % resolve -l, should be empty |
@@ -645,6 +645,9 b' def commit(ui, repo, *pats, **opts):' | |||||
645 | elif ui.verbose: |
|
645 | elif ui.verbose: | |
646 | ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) |
|
646 | ui.write(_('committed changeset %d:%s\n') % (rev,short(node))) | |
647 |
|
647 | |||
|
648 | ms = merge_.mergestate(repo) | |||
|
649 | ms.reset(node) | |||
|
650 | ||||
648 | def copy(ui, repo, *pats, **opts): |
|
651 | def copy(ui, repo, *pats, **opts): | |
649 | """mark files as copied for the next commit |
|
652 | """mark files as copied for the next commit | |
650 |
|
653 |
General Comments 0
You need to be logged in to leave comments.
Login now