68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69 [3] added c |
69 [3] added c |
70 $ echo bar > d |
70 $ echo bar > d |
71 $ hg add d |
71 $ hg add d |
72 $ hg amend |
72 $ hg amend |
73 1 new orphan changesets |
73 1 new unstable changesets |
74 $ hg glog |
74 $ hg glog |
75 @ 5:cb6a2ab625bb added c |
75 @ 6:cb6a2ab625bb added c |
76 | () draft |
76 | () draft |
77 | o 4:c41c793e0ef1 added d |
77 | o 4:c41c793e0ef1 added d |
78 | | () draft |
78 | | () draft |
79 | x 3:ca1b80f7960a added c |
79 | x 3:ca1b80f7960a added c |
80 |/ () draft |
80 |/ () draft |
131 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
131 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
132 ======================================================================== |
132 ======================================================================== |
133 |
133 |
134 $ hg next --evolve |
134 $ hg next --evolve |
135 move:[4] added d |
135 move:[4] added d |
136 atop:[5] added c |
136 atop:[6] added c |
137 merging d |
137 merging d |
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
139 fix conflicts and see `hg help evolve.interrupted` |
139 fix conflicts and see `hg help evolve.interrupted` |
140 [1] |
140 [1] |
141 |
141 |
153 $ hg evolve --stop |
153 $ hg evolve --stop |
154 stopped the interrupted evolve |
154 stopped the interrupted evolve |
155 working directory is now at cb6a2ab625bb |
155 working directory is now at cb6a2ab625bb |
156 |
156 |
157 $ hg glog |
157 $ hg glog |
158 @ 5:cb6a2ab625bb added c |
158 @ 6:cb6a2ab625bb added c |
159 | () draft |
159 | () draft |
160 | o 4:c41c793e0ef1 added d |
160 | o 4:c41c793e0ef1 added d |
161 | | () draft |
161 | | () draft |
162 | x 3:ca1b80f7960a added c |
162 | x 3:ca1b80f7960a added c |
163 |/ () draft |
163 |/ () draft |
191 we do `evolve --stop` |
191 we do `evolve --stop` |
192 -------------------------------------------------------------------------------- |
192 -------------------------------------------------------------------------------- |
193 |
193 |
194 $ hg evolve |
194 $ hg evolve |
195 move:[4] added d |
195 move:[4] added d |
196 atop:[5] added c |
196 atop:[6] added c |
197 merging d |
197 merging d |
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
198 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
199 fix conflicts and see `hg help evolve.interrupted` |
199 fix conflicts and see `hg help evolve.interrupted` |
200 [1] |
200 [1] |
201 $ echo foo > d |
201 $ echo foo > d |
204 continue: hg evolve --continue |
204 continue: hg evolve --continue |
205 $ hg evolve --continue |
205 $ hg evolve --continue |
206 evolving 4:c41c793e0ef1 "added d" |
206 evolving 4:c41c793e0ef1 "added d" |
207 working directory is now at 2a4e03d422e2 |
207 working directory is now at 2a4e03d422e2 |
208 $ hg glog |
208 $ hg glog |
209 @ 6:2a4e03d422e2 added d |
209 @ 7:2a4e03d422e2 added d |
210 | () draft |
210 | () draft |
211 o 5:cb6a2ab625bb added c |
211 o 6:cb6a2ab625bb added c |
212 | () draft |
212 | () draft |
213 o 2:b1661037fa25 added b |
213 o 2:b1661037fa25 added b |
214 | () draft |
214 | () draft |
215 o 1:c7586e2a9264 added a |
215 o 1:c7586e2a9264 added a |
216 | () draft |
216 | () draft |
220 $ hg up .^^^^ |
220 $ hg up .^^^^ |
221 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
221 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
222 $ echo bar > c |
222 $ echo bar > c |
223 $ hg add c |
223 $ hg add c |
224 $ hg amend |
224 $ hg amend |
225 4 new orphan changesets |
225 4 new unstable changesets |
226 |
226 |
227 $ hg glog |
227 $ hg glog |
228 @ 7:21817cd42526 added hgignore |
228 @ 9:21817cd42526 added hgignore |
229 () draft |
229 () draft |
230 o 6:2a4e03d422e2 added d |
230 o 7:2a4e03d422e2 added d |
231 | () draft |
231 | () draft |
232 o 5:cb6a2ab625bb added c |
232 o 6:cb6a2ab625bb added c |
233 | () draft |
233 | () draft |
234 o 2:b1661037fa25 added b |
234 o 2:b1661037fa25 added b |
235 | () draft |
235 | () draft |
236 o 1:c7586e2a9264 added a |
236 o 1:c7586e2a9264 added a |
237 | () draft |
237 | () draft |
238 x 0:8fa14d15e168 added hgignore |
238 x 0:8fa14d15e168 added hgignore |
239 () draft |
239 () draft |
240 |
240 |
241 $ hg evolve --all |
241 $ hg evolve --all |
242 move:[1] added a |
242 move:[1] added a |
243 atop:[7] added hgignore |
243 atop:[9] added hgignore |
244 move:[2] added b |
244 move:[2] added b |
245 move:[5] added c |
245 move:[6] added c |
246 merging c |
246 merging c |
247 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
247 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
248 fix conflicts and see `hg help evolve.interrupted` |
248 fix conflicts and see `hg help evolve.interrupted` |
249 [1] |
249 [1] |
250 |
250 |
256 stopped the interrupted evolve |
256 stopped the interrupted evolve |
257 working directory is now at aec285328e90 |
257 working directory is now at aec285328e90 |
258 |
258 |
259 Only changeset which has a successor now are obsoleted |
259 Only changeset which has a successor now are obsoleted |
260 $ hg glog |
260 $ hg glog |
261 @ 9:aec285328e90 added b |
261 @ 11:aec285328e90 added b |
262 | () draft |
262 | () draft |
263 o 8:fd00db71edca added a |
263 o 10:fd00db71edca added a |
264 | () draft |
264 | () draft |
265 o 7:21817cd42526 added hgignore |
265 o 9:21817cd42526 added hgignore |
266 () draft |
266 () draft |
267 o 6:2a4e03d422e2 added d |
267 o 7:2a4e03d422e2 added d |
268 | () draft |
268 | () draft |
269 o 5:cb6a2ab625bb added c |
269 o 6:cb6a2ab625bb added c |
270 | () draft |
270 | () draft |
271 x 2:b1661037fa25 added b |
271 x 2:b1661037fa25 added b |
272 | () draft |
272 | () draft |
273 x 1:c7586e2a9264 added a |
273 x 1:c7586e2a9264 added a |
274 | () draft |
274 | () draft |
276 () draft |
276 () draft |
277 |
277 |
278 Making sure doing evolve again resumes from right place and does the right thing |
278 Making sure doing evolve again resumes from right place and does the right thing |
279 |
279 |
280 $ hg evolve --all |
280 $ hg evolve --all |
281 move:[5] added c |
281 move:[6] added c |
282 atop:[9] added b |
282 atop:[11] added b |
283 merging c |
283 merging c |
284 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
284 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
285 fix conflicts and see `hg help evolve.interrupted` |
285 fix conflicts and see `hg help evolve.interrupted` |
286 [1] |
286 [1] |
287 |
287 |
288 $ echo foobar > c |
288 $ echo foobar > c |
289 $ hg resolve -m |
289 $ hg resolve -m |
290 (no more unresolved files) |
290 (no more unresolved files) |
291 continue: hg evolve --continue |
291 continue: hg evolve --continue |
292 $ hg evolve --continue |
292 $ hg evolve --continue |
293 evolving 5:cb6a2ab625bb "added c" |
293 evolving 6:cb6a2ab625bb "added c" |
294 move:[6] added d |
294 move:[7] added d |
295 atop:[10] added c |
295 atop:[12] added c |
296 working directory is now at cd0909a30222 |
296 working directory is now at cd0909a30222 |
297 $ hg glog |
297 $ hg glog |
298 @ 11:cd0909a30222 added d |
298 @ 13:cd0909a30222 added d |
299 | () draft |
299 | () draft |
300 o 10:cb1dd1086ef6 added c |
300 o 12:cb1dd1086ef6 added c |
301 | () draft |
301 | () draft |
302 o 9:aec285328e90 added b |
302 o 11:aec285328e90 added b |
303 | () draft |
303 | () draft |
304 o 8:fd00db71edca added a |
304 o 10:fd00db71edca added a |
305 | () draft |
305 | () draft |
306 o 7:21817cd42526 added hgignore |
306 o 9:21817cd42526 added hgignore |
307 () draft |
307 () draft |
308 |
308 |
309 Bookmarks should only be moved of the changesets which have been evolved, |
309 Bookmarks should only be moved of the changesets which have been evolved, |
310 bookmarks of rest of them should stay where they are are |
310 bookmarks of rest of them should stay where they are are |
311 ------------------------------------------------------------------------- |
311 ------------------------------------------------------------------------- |
317 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
317 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
318 (leaving bookmark b1) |
318 (leaving bookmark b1) |
319 $ hg bookmark b2 |
319 $ hg bookmark b2 |
320 |
320 |
321 $ hg glog |
321 $ hg glog |
322 o 11:cd0909a30222 added d |
322 o 13:cd0909a30222 added d |
323 | () draft |
323 | () draft |
324 o 10:cb1dd1086ef6 added c |
324 o 12:cb1dd1086ef6 added c |
325 | (b1) draft |
325 | (b1) draft |
326 @ 9:aec285328e90 added b |
326 @ 11:aec285328e90 added b |
327 | (b2) draft |
327 | (b2) draft |
328 o 8:fd00db71edca added a |
328 o 10:fd00db71edca added a |
329 | () draft |
329 | () draft |
330 o 7:21817cd42526 added hgignore |
330 o 9:21817cd42526 added hgignore |
331 () draft |
331 () draft |
332 |
332 |
333 $ hg prev |
333 $ hg prev |
334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
335 [8] added a |
335 [10] added a |
336 $ echo tom > c |
336 $ echo tom > c |
337 $ hg amend |
337 $ hg amend |
338 3 new orphan changesets |
338 3 new unstable changesets |
339 |
339 |
340 $ hg glog |
340 $ hg glog |
341 @ 12:a3cc2042492f added a |
341 @ 15:a3cc2042492f added a |
342 | () draft |
342 | () draft |
343 | o 11:cd0909a30222 added d |
343 | o 13:cd0909a30222 added d |
344 | | () draft |
344 | | () draft |
345 | o 10:cb1dd1086ef6 added c |
345 | o 12:cb1dd1086ef6 added c |
346 | | (b1) draft |
346 | | (b1) draft |
347 | o 9:aec285328e90 added b |
347 | o 11:aec285328e90 added b |
348 | | (b2) draft |
348 | | (b2) draft |
349 | x 8:fd00db71edca added a |
349 | x 10:fd00db71edca added a |
350 |/ () draft |
350 |/ () draft |
351 o 7:21817cd42526 added hgignore |
351 o 9:21817cd42526 added hgignore |
352 () draft |
352 () draft |
353 |
353 |
354 $ hg evolve --all |
354 $ hg evolve --all |
355 move:[9] added b |
355 move:[11] added b |
356 atop:[12] added a |
356 atop:[15] added a |
357 move:[10] added c |
357 move:[12] added c |
358 merging c |
358 merging c |
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
360 fix conflicts and see `hg help evolve.interrupted` |
360 fix conflicts and see `hg help evolve.interrupted` |
361 [1] |
361 [1] |
362 |
362 |
364 stopped the interrupted evolve |
364 stopped the interrupted evolve |
365 working directory is now at a3f4b95da934 |
365 working directory is now at a3f4b95da934 |
366 |
366 |
367 Bookmarks of only the changeset which are evolved is moved |
367 Bookmarks of only the changeset which are evolved is moved |
368 $ hg glog |
368 $ hg glog |
369 @ 13:a3f4b95da934 added b |
369 @ 16:a3f4b95da934 added b |
370 | (b2) draft |
370 | (b2) draft |
371 o 12:a3cc2042492f added a |
371 o 15:a3cc2042492f added a |
372 | () draft |
372 | () draft |
373 | o 11:cd0909a30222 added d |
373 | o 13:cd0909a30222 added d |
374 | | () draft |
374 | | () draft |
375 | o 10:cb1dd1086ef6 added c |
375 | o 12:cb1dd1086ef6 added c |
376 | | (b1) draft |
376 | | (b1) draft |
377 | x 9:aec285328e90 added b |
377 | x 11:aec285328e90 added b |
378 | | () draft |
378 | | () draft |
379 | x 8:fd00db71edca added a |
379 | x 10:fd00db71edca added a |
380 |/ () draft |
380 |/ () draft |
381 o 7:21817cd42526 added hgignore |
381 o 9:21817cd42526 added hgignore |
382 () draft |
382 () draft |