equal
deleted
inserted
replaced
158 $ hg evolve --any |
158 $ hg evolve --any |
159 recreate:[12] newer a |
159 recreate:[12] newer a |
160 atop:[8] newer a |
160 atop:[8] newer a |
161 rebasing to destination parent: 66719795a494 |
161 rebasing to destination parent: 66719795a494 |
162 computing new diff |
162 computing new diff |
163 commited as (a7cabd7bd9c2|671b9d7eeaec) (re) |
163 committed as (a7cabd7bd9c2|671b9d7eeaec) (re) |
164 $ glog |
164 $ glog |
165 @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
165 @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) |
166 | |
166 | |
167 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
167 | o 9:7bc2f5967f5e@default(draft) bk:[] add c |
168 | | |
168 | | |
319 merging a |
319 merging a |
320 warning: conflicts during merge. |
320 warning: conflicts during merge. |
321 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
321 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
322 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
322 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
323 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
323 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
324 abort: Merge conflict between several amendments, and this is not yet automated |
324 abort: merge conflict between several amendments (this is not automated yet) |
325 (/!\ You can try: |
325 (/!\ You can try: |
326 /!\ * manual merge + resolve => new cset X |
326 /!\ * manual merge + resolve => new cset X |
327 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
327 /!\ * hg up to the parent of the amended changeset (which are named W and Z) |
328 /!\ * hg revert --all -r X |
328 /!\ * hg revert --all -r X |
329 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |
329 /!\ * hg ci -m "same message as the amended changeset" => new cset Y |