Mercurial > hg
comparison tests/test-resolve.t @ 12117:a40372c1c731
tests: unify test-resolve
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 30 Aug 2010 14:06:18 +0900 |
parents | tests/test-resolve@51021f4c80b5 |
children | f2daa6ab514a |
comparison
equal
deleted
inserted
replaced
12116:f51858009328 | 12117:a40372c1c731 |
---|---|
1 test that a commit clears the merge state. | |
2 | |
3 $ hg init repo | |
4 $ cd repo | |
5 | |
6 $ echo foo > file | |
7 $ hg commit -Am 'add file' | |
8 adding file | |
9 | |
10 $ echo bar >> file | |
11 $ hg commit -Am 'append bar' | |
12 | |
13 | |
14 create a second head | |
15 | |
16 $ hg up -C 0 | |
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 $ echo baz >> file | |
19 $ hg commit -Am 'append baz' | |
20 created new head | |
21 | |
22 failing merge | |
23 | |
24 $ HGMERGE=internal:fail hg merge | |
25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
26 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
27 | |
28 $ echo resolved > file | |
29 $ hg resolve -m file | |
30 $ hg commit -m 'resolved' | |
31 | |
32 resolve -l, should be empty | |
33 | |
34 $ hg resolve -l | |
35 | |
36 test crashed merge with empty mergestate | |
37 | |
38 $ mkdir .hg/merge | |
39 $ touch .hg/merge/state | |
40 | |
41 resolve -l, should be empty | |
42 | |
43 $ hg resolve -l |