25 $ hg up 1 |
25 $ hg up 1 |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 (leaving bookmark changea) |
27 (leaving bookmark changea) |
28 $ echo a >> a |
28 $ echo a >> a |
29 $ hg amend -m changea |
29 $ hg amend -m changea |
30 1 new unstable changesets |
30 1 new orphan changesets |
31 $ hg evolve -v --confirm |
31 $ hg evolve -v --confirm |
32 move:[2] changea |
32 move:[2] changea |
33 atop:[4] changea |
33 atop:[3] changea |
34 perform evolve? [Ny] n |
34 perform evolve? [Ny] n |
35 abort: evolve aborted by user |
35 abort: evolve aborted by user |
36 [255] |
36 [255] |
37 $ echo y | hg evolve -v --confirm --config ui.interactive=True |
37 $ echo y | hg evolve -v --confirm --config ui.interactive=True |
38 move:[2] changea |
38 move:[2] changea |
39 atop:[4] changea |
39 atop:[3] changea |
40 perform evolve? [Ny] y |
40 perform evolve? [Ny] y |
41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
41 hg rebase -r cce2c55b8965 -d fb9d051ec0a4 |
42 resolving manifests |
42 resolving manifests |
43 $ glog --hidden |
43 $ glog --hidden |
44 @ 4:fb9d051ec0a4@default(draft) bk:[changea] changea |
44 @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea |
45 | |
45 | |
46 | x 3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a |
46 | x 2:cce2c55b8965@default(draft) bk:[] changea |
47 | | |
47 | | |
48 | | x 2:cce2c55b8965@default(draft) bk:[] changea |
|
49 | |/ |
|
50 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
48 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
51 |/ |
49 |/ |
52 o 0:07f494440405@default(draft) bk:[] adda |
50 o 0:07f494440405@default(draft) bk:[] adda |
53 |
51 |
54 $ hg debugobsolete |
52 $ hg debugobsolete |
55 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
53 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
56 c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
|
57 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
54 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob) |
58 |
55 |
59 Test evolve with conflict |
56 Test evolve with conflict |
60 |
57 |
61 $ ls |
58 $ ls |
71 $ echo 'newer a' >> a |
68 $ echo 'newer a' >> a |
72 $ hg ci -m 'newer a' |
69 $ hg ci -m 'newer a' |
73 $ hg gdown |
70 $ hg gdown |
74 gdown have been deprecated in favor of previous |
71 gdown have been deprecated in favor of previous |
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
76 [4] changea |
73 [3] changea |
77 $ echo 'a' > a |
74 $ echo 'a' > a |
78 $ hg amend |
75 $ hg amend |
79 1 new unstable changesets |
76 1 new orphan changesets |
80 $ hg evolve |
77 $ hg evolve |
81 move:[5] newer a |
78 move:[4] newer a |
82 atop:[7] changea |
79 atop:[5] changea |
83 merging a |
80 merging a |
84 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
81 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
85 evolve failed! |
82 evolve failed! |
86 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
83 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
87 abort: unresolved merge conflicts (see hg help resolve) |
84 abort: unresolved merge conflicts (see hg help resolve) |
88 [255] |
85 [255] |
89 $ hg revert -r 'unstable()' a |
86 $ hg revert -r "orphan()" a |
90 $ hg diff |
87 $ hg diff |
91 diff -r 66719795a494 a |
88 diff -r 66719795a494 a |
92 --- a/a * (glob) |
89 --- a/a * (glob) |
93 +++ b/a * (glob) |
90 +++ b/a * (glob) |
94 @@ -1,1 +1,3 @@ |
91 @@ -1,1 +1,3 @@ |
95 a |
92 a |
96 +a |
93 +a |
97 +newer a |
94 +newer a |
98 $ hg evolve --continue |
95 $ hg evolve --continue |
99 grafting 5:3655f0f50885 "newer a" |
96 grafting 4:3655f0f50885 "newer a" |
100 abort: unresolved merge conflicts (see 'hg help resolve') |
97 abort: unresolved merge conflicts (see 'hg help resolve') |
101 [255] |
98 [255] |
102 $ hg resolve -m a |
99 $ hg resolve -m a |
103 (no more unresolved files) |
100 (no more unresolved files) |
104 $ hg evolve --continue |
101 $ hg evolve --continue |
105 grafting 5:3655f0f50885 "newer a" |
102 grafting 4:3655f0f50885 "newer a" |
106 |
103 |
107 Stabilize latecomer with different parent |
104 Stabilize latecomer with different parent |
108 ========================================= |
105 ========================================= |
109 |
106 |
110 (the same-parent case is handled in test-evolve.t) |
107 (the same-parent case is handled in test-evolve.t) |
111 |
108 |
112 $ glog |
109 $ glog |
113 @ 8:1cf0aacfd363@default(draft) bk:[] newer a |
110 @ 6:1cf0aacfd363@default(draft) bk:[] newer a |
114 | |
111 | |
115 o 7:66719795a494@default(draft) bk:[changea] changea |
112 o 5:66719795a494@default(draft) bk:[changea] changea |
116 | |
113 | |
117 o 0:07f494440405@default(draft) bk:[] adda |
114 o 0:07f494440405@default(draft) bk:[] adda |
118 |
115 |
119 Add another commit |
116 Add another commit |
120 |
117 |
121 $ hg gdown |
118 $ hg gdown |
122 gdown have been deprecated in favor of previous |
119 gdown have been deprecated in favor of previous |
123 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
124 [7] changea |
121 [5] changea |
125 $ echo 'c' > c |
122 $ echo 'c' > c |
126 $ hg add c |
123 $ hg add c |
127 $ hg commit -m 'add c' |
124 $ hg commit -m 'add c' |
128 created new head |
125 created new head |
129 |
126 |
130 Get a successors of 8 on it |
127 Get a successors of 8 on it |
131 |
128 |
132 $ hg grab 1cf0aacfd363 |
129 $ hg grab 1cf0aacfd363 |
133 rebasing 8:1cf0aacfd363 "newer a" |
130 rebasing 6:1cf0aacfd363 "newer a" |
134 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
131 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
135 |
132 |
136 Add real change to the successors |
133 Add real change to the successors |
137 |
134 |
138 $ echo 'babar' >> a |
135 $ echo 'babar' >> a |
139 $ hg amend |
136 $ hg amend |
140 |
137 |
141 Make precursors public |
138 Make precursors public |
142 |
139 |
143 $ hg phase --hidden --public 1cf0aacfd363 |
140 $ hg phase --hidden --public 1cf0aacfd363 |
144 1 new bumped changesets |
141 1 new phase-divergent changesets |
145 $ glog |
142 $ glog |
146 @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
143 @ 9:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re) |
147 | |
144 | |
148 o 9:7bc2f5967f5e@default(draft) bk:[] add c |
145 o 7:7bc2f5967f5e@default(draft) bk:[] add c |
149 | |
146 | |
150 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
147 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
151 |/ |
148 |/ |
152 o 7:66719795a494@default(public) bk:[changea] changea |
149 o 5:66719795a494@default(public) bk:[changea] changea |
153 | |
150 | |
154 o 0:07f494440405@default(public) bk:[] adda |
151 o 0:07f494440405@default(public) bk:[] adda |
155 |
152 |
156 |
153 |
157 Stabilize! |
154 Stabilize! |
158 |
155 |
159 $ hg evolve --any --dry-run --phasedivergent |
156 $ hg evolve --any --dry-run --phasedivergent |
160 recreate:[12] newer a |
157 recreate:[9] newer a |
161 atop:[8] newer a |
158 atop:[6] newer a |
162 hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re) |
159 hg rebase --rev d5c7ef82d003 --dest 66719795a494; |
163 hg update 1cf0aacfd363; |
160 hg update 1cf0aacfd363; |
164 hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re) |
161 hg revert --all --rev d5c7ef82d003; |
165 hg commit --msg "bumped update to %s" (no-eol) |
162 hg commit --msg "bumped update to %s" (no-eol) |
166 $ hg evolve --any --confirm --phasedivergent |
163 $ hg evolve --any --confirm --phasedivergent |
167 recreate:[12] newer a |
164 recreate:[9] newer a |
168 atop:[8] newer a |
165 atop:[6] newer a |
169 perform evolve? [Ny] n |
166 perform evolve? [Ny] n |
170 abort: evolve aborted by user |
167 abort: evolve aborted by user |
171 [255] |
168 [255] |
172 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent |
169 $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent |
173 recreate:[12] newer a |
170 recreate:[9] newer a |
174 atop:[8] newer a |
171 atop:[6] newer a |
175 perform evolve? [Ny] y |
172 perform evolve? [Ny] y |
176 rebasing to destination parent: 66719795a494 |
173 rebasing to destination parent: 66719795a494 |
177 computing new diff |
174 computing new diff |
178 committed as c2c1151aa854 |
175 committed as c2c1151aa854 |
179 working directory is now at c2c1151aa854 |
176 working directory is now at c2c1151aa854 |
180 $ glog |
177 $ glog |
181 @ 14:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
178 @ 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
182 | |
179 | |
183 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
180 | o 7:7bc2f5967f5e@default(draft) bk:[] add c |
184 | | |
181 | | |
185 o | 8:1cf0aacfd363@default(public) bk:[] newer a |
182 o | 6:1cf0aacfd363@default(public) bk:[] newer a |
186 |/ |
183 |/ |
187 o 7:66719795a494@default(public) bk:[changea] changea |
184 o 5:66719795a494@default(public) bk:[changea] changea |
188 | |
185 | |
189 o 0:07f494440405@default(public) bk:[] adda |
186 o 0:07f494440405@default(public) bk:[] adda |
190 |
187 |
191 |
188 |
192 Stabilize divergent changesets with same parent |
189 Stabilize divergent changesets with same parent |
226 $ mv a a.old |
223 $ mv a a.old |
227 $ echo 'jungle' > a |
224 $ echo 'jungle' > a |
228 $ cat a.old >> a |
225 $ cat a.old >> a |
229 $ rm a.old |
226 $ rm a.old |
230 $ hg amend |
227 $ hg amend |
231 2 new divergent changesets |
228 2 new content-divergent changesets |
232 $ glog |
229 $ glog |
233 @ 19:eacc9c8240fe@default(draft) bk:[] More addition |
230 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
234 | |
231 | |
235 | o 17:d2f173e25686@default(draft) bk:[] More addition |
232 | o 13:d2f173e25686@default(draft) bk:[] More addition |
236 |/ |
233 |/ |
237 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
234 | o 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
238 | | |
235 | | |
239 o | 9:7bc2f5967f5e@default(draft) bk:[] add c |
236 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
240 | | |
237 | | |
241 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
238 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
242 |/ |
239 |/ |
243 o 7:66719795a494@default(public) bk:[changea] changea |
240 o 5:66719795a494@default(public) bk:[changea] changea |
244 | |
241 | |
245 o 0:07f494440405@default(public) bk:[] adda |
242 o 0:07f494440405@default(public) bk:[] adda |
246 |
243 |
247 |
244 |
248 Stabilize it |
245 Stabilize it |
249 |
246 |
250 $ hg evolve -qn --confirm --contentdivergent |
247 $ hg evolve -qn --confirm --contentdivergent |
251 merge:[19] More addition |
248 merge:[14] More addition |
252 with: [17] More addition |
249 with: [13] More addition |
253 base: [15] More addition |
250 base: [12] More addition |
254 perform evolve? [Ny] n |
251 perform evolve? [Ny] n |
255 abort: evolve aborted by user |
252 abort: evolve aborted by user |
256 [255] |
253 [255] |
257 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent |
254 $ echo y | hg evolve -qn --confirm --config ui.interactive=True --contentdivergent |
258 merge:[19] More addition |
255 merge:[14] More addition |
259 with: [17] More addition |
256 with: [13] More addition |
260 base: [15] More addition |
257 base: [12] More addition |
261 perform evolve? [Ny] y |
258 perform evolve? [Ny] y |
262 hg update -c eacc9c8240fe && |
259 hg update -c eacc9c8240fe && |
263 hg merge d2f173e25686 && |
260 hg merge d2f173e25686 && |
264 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
261 hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&& |
265 hg up -C 3932c176bbaa && |
262 hg up -C 3932c176bbaa && |
266 hg revert --all --rev tip && |
263 hg revert --all --rev tip && |
267 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
264 hg commit -m "`hg log -r eacc9c8240fe --template={desc}`"; |
268 $ hg evolve -v --contentdivergent |
265 $ hg evolve -v --contentdivergent |
269 merge:[19] More addition |
266 merge:[14] More addition |
270 with: [17] More addition |
267 with: [13] More addition |
271 base: [15] More addition |
268 base: [12] More addition |
272 merging divergent changeset |
269 merging divergent changeset |
273 resolving manifests |
270 resolving manifests |
274 merging a |
271 merging a |
275 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
272 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
276 amending changeset eacc9c8240fe |
273 amending changeset eacc9c8240fe |
277 committing files: |
274 committing files: |
278 a |
275 a |
279 committing manifest |
276 committing manifest |
280 committing changelog |
277 committing changelog |
281 copying changeset 283ccd10e2b8 to 7bc2f5967f5e |
278 committed changeset 15:f344982e63c4 |
282 committing files: |
|
283 a |
|
284 committing manifest |
|
285 committing changelog |
|
286 committed changeset 21:f344982e63c4 |
|
287 working directory is now at f344982e63c4 |
279 working directory is now at f344982e63c4 |
288 $ hg st |
280 $ hg st |
289 $ glog |
281 $ glog |
290 @ 21:f344982e63c4@default(draft) bk:[] More addition |
282 @ 15:f344982e63c4@default(draft) bk:[] More addition |
291 | |
283 | |
292 | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
284 | o 11:c2c1151aa854@default(draft) bk:[] bumped update to 1cf0aacfd363: |
293 | | |
285 | | |
294 o | 9:7bc2f5967f5e@default(draft) bk:[] add c |
286 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
295 | | |
287 | | |
296 | o 8:1cf0aacfd363@default(public) bk:[] newer a |
288 | o 6:1cf0aacfd363@default(public) bk:[] newer a |
297 |/ |
289 |/ |
298 o 7:66719795a494@default(public) bk:[changea] changea |
290 o 5:66719795a494@default(public) bk:[changea] changea |
299 | |
291 | |
300 o 0:07f494440405@default(public) bk:[] adda |
292 o 0:07f494440405@default(public) bk:[] adda |
301 |
293 |
302 $ hg summary |
294 $ hg summary |
303 parent: 21:f344982e63c4 tip |
295 parent: 15:f344982e63c4 tip |
304 More addition |
296 More addition |
305 branch: default |
297 branch: default |
306 commit: (clean) |
298 commit: (clean) |
307 update: 2 new changesets, 2 branch heads (merge) |
299 update: 2 new changesets, 2 branch heads (merge) |
308 phases: 3 draft |
300 phases: 3 draft |
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
328 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 working directory parent is obsolete! (3932c176bbaa) |
329 working directory parent is obsolete! (3932c176bbaa) |
338 (use 'hg evolve' to update to its successor: f344982e63c4) |
330 (use 'hg evolve' to update to its successor: f344982e63c4) |
339 $ echo 'gotta break' >> a |
331 $ echo 'gotta break' >> a |
340 $ hg amend |
332 $ hg amend |
341 2 new divergent changesets |
333 2 new content-divergent changesets |
342 # reamend so that the case is not the first precursor. |
334 # reamend so that the case is not the first precursor. |
343 $ hg amend -m "More addition (2)" |
335 $ hg amend -m "More addition (2)" |
344 $ hg phase 'divergent()' |
336 $ hg phase 'contentdivergent()' |
345 21: draft |
337 15: draft |
346 24: draft |
338 17: draft |
347 $ hg evolve -qn --contentdivergent |
339 $ hg evolve -qn --contentdivergent |
348 hg update -c 0b336205a5d0 && |
340 hg update -c 0b336205a5d0 && |
349 hg merge f344982e63c4 && |
341 hg merge f344982e63c4 && |
350 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
342 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
351 hg up -C 3932c176bbaa && |
343 hg up -C 3932c176bbaa && |
352 hg revert --all --rev tip && |
344 hg revert --all --rev tip && |
353 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
345 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
354 $ hg evolve --contentdivergent |
346 $ hg evolve --contentdivergent |
355 merge:[24] More addition (2) |
347 merge:[17] More addition (2) |
356 with: [21] More addition |
348 with: [15] More addition |
357 base: [15] More addition |
349 base: [12] More addition |
358 merging a |
350 merging a |
359 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
351 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
360 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
352 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
361 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort |
353 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort |
362 abort: merge conflict between several amendments (this is not automated yet) |
354 abort: merge conflict between several amendments (this is not automated yet) |