19 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
19 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
20 $ echo "D" >> A |
20 $ echo "D" >> A |
21 $ commit "D" 3 |
21 $ commit "D" 3 |
22 created new head |
22 created new head |
23 |
23 |
|
24 State before the merge |
|
25 |
|
26 $ hg status |
|
27 $ hg id |
|
28 e45016d2b3d3 tip |
|
29 $ hg summary |
|
30 parent: 3:e45016d2b3d3 tip |
|
31 D |
|
32 branch: default |
|
33 commit: (clean) |
|
34 update: 2 new changesets, 2 branch heads (merge) |
|
35 phases: 4 draft |
|
36 |
|
37 Testing the abort functionality first in case of conflicts |
|
38 |
|
39 $ hg merge --abort |
|
40 abort: no merge in progress |
|
41 [255] |
|
42 $ hg merge |
|
43 merging A |
|
44 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
|
45 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
46 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
47 [1] |
|
48 |
|
49 $ hg merge --abort e4501 |
|
50 abort: cannot specify a node with --abort |
|
51 [255] |
|
52 $ hg merge --abort --rev e4501 |
|
53 abort: cannot specify both --rev and --abort |
|
54 [255] |
|
55 |
|
56 $ hg merge --abort |
|
57 aborting the merge, updating back to e45016d2b3d3 |
|
58 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
59 |
|
60 Checking that we got back in the same state |
|
61 |
|
62 $ hg status |
|
63 ? A.orig |
|
64 $ hg id |
|
65 e45016d2b3d3 tip |
|
66 $ hg summary |
|
67 parent: 3:e45016d2b3d3 tip |
|
68 D |
|
69 branch: default |
|
70 commit: 1 unknown (clean) |
|
71 update: 2 new changesets, 2 branch heads (merge) |
|
72 phases: 4 draft |
|
73 |
24 Merging a conflict araises |
74 Merging a conflict araises |
25 |
75 |
26 $ hg merge |
76 $ hg merge |
27 merging A |
77 merging A |
28 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
78 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
29 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
79 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
30 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
80 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
31 [1] |
81 [1] |
32 |
82 |
33 Correct the conflict without marking the file as resolved |
83 Correct the conflict without marking the file as resolved |
34 |
84 |
35 $ echo "ABCD" > A |
85 $ echo "ABCD" > A |
50 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
100 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
51 $ hg merge 2 |
101 $ hg merge 2 |
52 merging A |
102 merging A |
53 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
103 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
54 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
104 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
105 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
56 [1] |
106 [1] |
57 $ hg rm --force A |
107 $ hg rm --force A |
58 $ hg commit -m merged |
108 $ hg commit -m merged |
59 abort: unresolved merge conflicts (see 'hg help resolve') |
109 abort: unresolved merge conflicts (see 'hg help resolve') |
60 [255] |
110 [255] |
62 $ hg resolve -ma |
112 $ hg resolve -ma |
63 (no more unresolved files) |
113 (no more unresolved files) |
64 $ hg commit -m merged |
114 $ hg commit -m merged |
65 created new head |
115 created new head |
66 |
116 |
|
117 Testing the abort functionality in case of no conflicts |
|
118 |
|
119 $ hg update -C 0 |
|
120 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
121 $ addcommit "E" 4 |
|
122 created new head |
|
123 $ hg id |
|
124 68352a18a7c4 tip |
|
125 |
|
126 $ hg merge -r 4 |
|
127 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
128 (branch merge, don't forget to commit) |
|
129 |
|
130 $ hg merge --preview --abort |
|
131 abort: cannot specify --preview with --abort |
|
132 [255] |
|
133 |
|
134 $ hg merge --abort |
|
135 aborting the merge, updating back to 68352a18a7c4 |
|
136 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
137 |
|
138 $ hg id |
|
139 68352a18a7c4 tip |
|
140 |
67 $ cd .. |
141 $ cd .. |