equal
deleted
inserted
replaced
|
1 test that we don't interrupt the merge session if |
|
2 a file-level merge failed |
|
3 |
|
4 $ hg init repo |
|
5 $ cd repo |
|
6 |
|
7 $ echo foo > foo |
|
8 $ echo a > bar |
|
9 $ hg ci -Am 'add foo' |
|
10 adding bar |
|
11 adding foo |
|
12 |
|
13 $ hg mv foo baz |
|
14 $ echo b >> bar |
|
15 $ echo quux > quux1 |
|
16 $ hg ci -Am 'mv foo baz' |
|
17 adding quux1 |
|
18 |
|
19 $ hg up -qC 0 |
|
20 $ echo >> foo |
|
21 $ echo c >> bar |
|
22 $ echo quux > quux2 |
|
23 $ hg ci -Am 'change foo' |
|
24 adding quux2 |
|
25 created new head |
|
26 |
|
27 test with the rename on the remote side |
|
28 $ HGMERGE=false hg merge |
|
29 merging bar |
|
30 merging bar failed! |
|
31 merging foo and baz to baz |
|
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
33 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
34 $ hg resolve -l |
|
35 U bar |
|
36 R baz |
|
37 |
|
38 test with the rename on the local side |
|
39 $ hg up -C 1 |
|
40 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
41 $ HGMERGE=false hg merge |
|
42 merging bar |
|
43 merging bar failed! |
|
44 merging baz and foo to baz |
|
45 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
46 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
47 |
|
48 show unresolved |
|
49 $ hg resolve -l |
|
50 U bar |
|
51 R baz |
|
52 |
|
53 unmark baz |
|
54 $ hg resolve -u baz |
|
55 |
|
56 show |
|
57 $ hg resolve -l |
|
58 U bar |
|
59 U baz |
|
60 $ hg st |
|
61 M bar |
|
62 M baz |
|
63 M quux2 |
|
64 ? bar.orig |
|
65 |
|
66 re-resolve baz |
|
67 $ hg resolve baz |
|
68 merging baz and foo to baz |
|
69 |
|
70 after resolve |
|
71 $ hg resolve -l |
|
72 U bar |
|
73 R baz |
|
74 |
|
75 resolve all warning |
|
76 $ hg resolve |
|
77 abort: no files or directories specified; use --all to remerge all files |
|
78 |
|
79 resolve all |
|
80 $ hg resolve -a |
|
81 merging bar |
|
82 warning: conflicts during merge. |
|
83 merging bar failed! |
|
84 |
|
85 after |
|
86 $ hg resolve -l |
|
87 U bar |
|
88 R baz |
|
89 |
|
90 $ true |