equal
deleted
inserted
replaced
86 merging d |
86 merging d |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
87 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
88 fix conflicts and see `hg help evolve.interrupted` |
88 fix conflicts and see `hg help evolve.interrupted` |
89 [1] |
89 [1] |
90 |
90 |
|
91 $ hg parents |
|
92 changeset: 6:e93a9161a274 |
|
93 tag: tip |
|
94 parent: 2:b1661037fa25 |
|
95 user: test |
|
96 date: Thu Jan 01 00:00:00 1970 +0000 |
|
97 summary: added c |
|
98 |
|
99 changeset: 4:c41c793e0ef1 |
|
100 user: test |
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 trouble: unstable |
|
103 summary: added d |
|
104 |
|
105 |
91 $ hg evolve --abort |
106 $ hg evolve --abort |
92 evolve aborted |
107 evolve aborted |
93 working directory is now at e93a9161a274 |
108 working directory is now at e93a9161a274 |
94 |
109 |
95 $ hg glog |
110 $ hg glog |
158 | () draft |
173 | () draft |
159 o 9:125af0ed8cae added a |
174 o 9:125af0ed8cae added a |
160 | () draft |
175 | () draft |
161 | o 7:e83de241f751 added d |
176 | o 7:e83de241f751 added d |
162 | | () draft |
177 | | () draft |
163 | o 6:e93a9161a274 added c |
178 | @ 6:e93a9161a274 added c |
164 | | () draft |
179 | | () draft |
165 | x 2:b1661037fa25 added b |
180 | x 2:b1661037fa25 added b |
166 | | () draft |
181 | | () draft |
167 | x 1:c7586e2a9264 added a |
182 | x 1:c7586e2a9264 added a |
168 |/ () draft |
183 |/ () draft |
250 | () draft |
265 | () draft |
251 | o 9:db3b42ef4da7 added b |
266 | o 9:db3b42ef4da7 added b |
252 |/ () draft |
267 |/ () draft |
253 @ 8:807e8e2ca559 added a |
268 @ 8:807e8e2ca559 added a |
254 | () draft |
269 | () draft |
255 | o 6:8f20d4390c21 foo to a |
270 | @ 6:8f20d4390c21 foo to a |
256 | | () draft |
271 | | () draft |
257 | | o 5:bcb1c47f8520 added d |
272 | | o 5:bcb1c47f8520 added d |
258 | | | () draft |
273 | | | () draft |
259 | | x 4:86d2603075a3 added c |
274 | | x 4:86d2603075a3 added c |
260 | |/ () draft |
275 | |/ () draft |
312 | () draft |
327 | () draft |
313 | o 9:db3b42ef4da7 added b |
328 | o 9:db3b42ef4da7 added b |
314 |/ () draft |
329 |/ () draft |
315 @ 8:807e8e2ca559 added a |
330 @ 8:807e8e2ca559 added a |
316 | () draft |
331 | () draft |
317 | o 6:8f20d4390c21 foo to a |
332 | @ 6:8f20d4390c21 foo to a |
318 | | () draft |
333 | | () draft |
319 | | o 5:bcb1c47f8520 added d |
334 | | o 5:bcb1c47f8520 added d |
320 | | | () draft |
335 | | | () draft |
321 | | x 4:86d2603075a3 added c |
336 | | x 4:86d2603075a3 added c |
322 | |/ () draft |
337 | |/ () draft |
395 | | () draft |
410 | | () draft |
396 | o 9:db3b42ef4da7 added b |
411 | o 9:db3b42ef4da7 added b |
397 |/ () draft |
412 |/ () draft |
398 @ 8:807e8e2ca559 added a |
413 @ 8:807e8e2ca559 added a |
399 | () draft |
414 | () draft |
400 | o 6:8f20d4390c21 foo to a |
415 | @ 6:8f20d4390c21 foo to a |
401 | | () draft |
416 | | () draft |
402 | x 1:2f913b0c9220 added a |
417 | x 1:2f913b0c9220 added a |
403 |/ () draft |
418 |/ () draft |
404 o 0:8fa14d15e168 added hgignore |
419 o 0:8fa14d15e168 added hgignore |
405 () draft |
420 () draft |
463 $ hg glog |
478 $ hg glog |
464 @ 6:c1f4718020e3 added b |
479 @ 6:c1f4718020e3 added b |
465 | (bm1) draft |
480 | (bm1) draft |
466 o 5:a0086c17bfc7 added a |
481 o 5:a0086c17bfc7 added a |
467 | () draft |
482 | () draft |
468 | o 3:17509928e5bf added c |
483 | @ 3:17509928e5bf added c |
469 | | () draft |
484 | | () draft |
470 | x 2:9f0c80a55ddc added b |
485 | x 2:9f0c80a55ddc added b |
471 | | () draft |
486 | | () draft |
472 | x 1:2f913b0c9220 added a |
487 | x 1:2f913b0c9220 added a |
473 |/ () draft |
488 |/ () draft |
506 [1] |
521 [1] |
507 |
522 |
508 $ hg evolve --abort |
523 $ hg evolve --abort |
509 evolve aborted |
524 evolve aborted |
510 working directory is now at c1f4718020e3 |
525 working directory is now at c1f4718020e3 |
|
526 |
|
527 $ ls .hg/ |
|
528 00changelog.i |
|
529 bookmarks |
|
530 branch |
|
531 cache |
|
532 dirstate |
|
533 last-message.txt |
|
534 requires |
|
535 store |
|
536 undo.backup.bookmarks |
|
537 undo.backup.dirstate |
|
538 undo.bookmarks |
|
539 undo.branch |
|
540 undo.desc |
|
541 undo.dirstate |