equal
deleted
inserted
replaced
82 move:[5] newer a |
82 move:[5] newer a |
83 atop:[7] changea |
83 atop:[7] changea |
84 merging a |
84 merging a |
85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
85 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
86 evolve failed! |
86 evolve failed! |
87 fix conflict and run "hg evolve --continue" or use "hg update -C" to abort |
87 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
88 abort: unresolved merge conflicts (see hg help resolve) |
88 abort: unresolved merge conflicts (see hg help resolve) |
89 [255] |
89 [255] |
90 $ hg revert -r 'unstable()' a |
90 $ hg revert -r 'unstable()' a |
91 $ hg diff |
91 $ hg diff |
92 diff -r 66719795a494 a |
92 diff -r 66719795a494 a |
221 $ echo 'babar' >> a |
221 $ echo 'babar' >> a |
222 $ hg amend |
222 $ hg amend |
223 $ hg up --hidden 15 |
223 $ hg up --hidden 15 |
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
224 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
225 working directory parent is obsolete! |
225 working directory parent is obsolete! |
226 (use "hg evolve" to update to its successor) |
226 (use 'hg evolve' to update to its successor) |
227 $ mv a a.old |
227 $ mv a a.old |
228 $ echo 'jungle' > a |
228 $ echo 'jungle' > a |
229 $ cat a.old >> a |
229 $ cat a.old >> a |
230 $ rm a.old |
230 $ rm a.old |
231 $ hg amend |
231 $ hg amend |
334 ------------------------------------------------- |
334 ------------------------------------------------- |
335 |
335 |
336 $ hg up --hidden 15 |
336 $ hg up --hidden 15 |
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
337 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
338 working directory parent is obsolete! |
338 working directory parent is obsolete! |
339 (use "hg evolve" to update to its successor) |
339 (use 'hg evolve' to update to its successor) |
340 $ echo 'gotta break' >> a |
340 $ echo 'gotta break' >> a |
341 $ hg amend |
341 $ hg amend |
342 2 new divergent changesets |
342 2 new divergent changesets |
343 # reamend so that the case is not the first precursor. |
343 # reamend so that the case is not the first precursor. |
344 $ hg amend -m "More addition (2)" |
344 $ hg amend -m "More addition (2)" |
357 with: [21] More addition |
357 with: [21] More addition |
358 base: [15] More addition |
358 base: [15] More addition |
359 merging a |
359 merging a |
360 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
360 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
361 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
362 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
362 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort |
363 abort: merge conflict between several amendments (this is not automated yet) |
363 abort: merge conflict between several amendments (this is not automated yet) |
364 (/!\ You can try: |
364 (/!\ You can try: |
365 /!\ * manual merge + resolve => new cset X |
365 /!\ * manual merge + resolve => new cset X |
366 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
366 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
367 /!\ * hg revert --all -r X |
367 /!\ * hg revert --all -r X |