21 |
21 |
22 $ hg commit -m "commit #3" |
22 $ hg commit -m "commit #3" |
23 abort: cannot commit merge with missing files |
23 abort: cannot commit merge with missing files |
24 [255] |
24 [255] |
25 |
25 |
|
26 |
|
27 Test conflict*() revsets |
|
28 |
|
29 # Bad usage |
|
30 $ hg log -r 'conflictlocal(foo)' |
|
31 hg: parse error: conflictlocal takes no arguments |
|
32 [255] |
|
33 $ hg log -r 'conflictother(foo)' |
|
34 hg: parse error: conflictother takes no arguments |
|
35 [255] |
|
36 $ hg co -C . |
|
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
38 # No merge parents when not merging |
|
39 $ hg log -r 'conflictlocal() + conflictother()' |
|
40 # No merge parents when there is no conflict |
|
41 $ hg merge 1 |
|
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
43 (branch merge, don't forget to commit) |
|
44 $ hg log -r 'conflictlocal() + conflictother()' |
|
45 $ hg co -C . |
|
46 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
47 $ echo conflict > b |
|
48 $ hg ci -Aqm 'conflicting change to b' |
|
49 $ hg merge 1 |
|
50 merging b |
|
51 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
52 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
53 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
54 [1] |
|
55 # Shows merge parents when there is a conflict |
|
56 $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n' |
|
57 3 conflicting change to b |
|
58 $ hg log -r 'conflictother()' -T '{rev} {desc}\n' |
|
59 1 commit #1 |