317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 working directory parent is obsolete! |
318 working directory parent is obsolete! |
319 $ echo 'gotta break' >> a |
319 $ echo 'gotta break' >> a |
320 $ hg amend |
320 $ hg amend |
321 2 new divergent changesets |
321 2 new divergent changesets |
|
322 # reamend so that the case is not the first precursor. |
|
323 $ hg amend -m "More addition (2)" |
322 $ hg phase 'divergent()' |
324 $ hg phase 'divergent()' |
323 21: draft |
325 21: draft |
324 23: draft |
326 24: draft |
325 $ hg evolve -qn |
327 $ hg evolve -qn |
326 hg update -c 36e188246d67 && |
328 hg update -c 0b336205a5d0 && |
327 hg merge f344982e63c4 && |
329 hg merge f344982e63c4 && |
328 hg commit -m "auto merge resolving conflict between 36e188246d67 and f344982e63c4"&& |
330 hg commit -m "auto merge resolving conflict between 0b336205a5d0 and f344982e63c4"&& |
329 hg up -C 3932c176bbaa && |
331 hg up -C 3932c176bbaa && |
330 hg revert --all --rev tip && |
332 hg revert --all --rev tip && |
331 hg commit -m "`hg log -r 36e188246d67 --template={desc}`"; |
333 hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`"; |
332 $ hg evolve |
334 $ hg evolve |
333 merge:[23] More addition |
335 merge:[24] More addition (2) |
334 with: [21] More addition |
336 with: [21] More addition |
335 base: [15] More addition |
337 base: [15] More addition |
336 merging a |
338 merging a |
337 warning: conflicts during merge. |
339 warning: conflicts during merge. |
338 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |
340 merging a incomplete! (edit conflicts, then use 'hg resolve --mark') |