equal
deleted
inserted
replaced
29 o 1:c7586e2a9264 added a |
29 o 1:c7586e2a9264 added a |
30 | () draft |
30 | () draft |
31 o 0:8fa14d15e168 added hgignore |
31 o 0:8fa14d15e168 added hgignore |
32 () draft |
32 () draft |
33 |
33 |
34 Simple case of evolve --continue (with --[no-]update flag) |
34 Simple case of evolve --continue |
35 |
35 |
36 $ hg up ca1b80f7960a |
36 $ hg up ca1b80f7960a |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 $ echo bar > d |
38 $ echo bar > d |
39 $ hg add d |
39 $ hg add d |
51 o 1:c7586e2a9264 added a |
51 o 1:c7586e2a9264 added a |
52 | () draft |
52 | () draft |
53 o 0:8fa14d15e168 added hgignore |
53 o 0:8fa14d15e168 added hgignore |
54 () draft |
54 () draft |
55 |
55 |
56 $ hg evolve --all --no-update |
56 $ hg evolve --all |
57 move:[4] added d |
57 move:[4] added d |
58 atop:[5] added c |
58 atop:[5] added c |
59 merging d |
59 merging d |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
61 fix conflicts and see `hg help evolve.interrupted` |
61 fix conflicts and see `hg help evolve.interrupted` |