equal
deleted
inserted
replaced
216 |
216 |
217 $ echo 'babar' >> a |
217 $ echo 'babar' >> a |
218 $ hg amend |
218 $ hg amend |
219 $ hg up --hidden 3932c176bbaa |
219 $ hg up --hidden 3932c176bbaa |
220 updating to a hidden changeset 3932c176bbaa |
220 updating to a hidden changeset 3932c176bbaa |
|
221 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) |
221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 working directory parent is obsolete! (3932c176bbaa) |
223 working directory parent is obsolete! (3932c176bbaa) |
223 (use 'hg evolve' to update to its successor: d2f173e25686) |
224 (use 'hg evolve' to update to its successor: d2f173e25686) |
224 $ mv a a.old |
225 $ mv a a.old |
225 $ echo 'jungle' > a |
226 $ echo 'jungle' > a |
325 Check conflict during divergence resolution |
326 Check conflict during divergence resolution |
326 ------------------------------------------------- |
327 ------------------------------------------------- |
327 |
328 |
328 $ hg up --hidden 3932c176bbaa |
329 $ hg up --hidden 3932c176bbaa |
329 updating to a hidden changeset 3932c176bbaa |
330 updating to a hidden changeset 3932c176bbaa |
|
331 (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) |
330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
332 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
331 working directory parent is obsolete! (3932c176bbaa) |
333 working directory parent is obsolete! (3932c176bbaa) |
332 (use 'hg evolve' to update to its successor: f344982e63c4) |
334 (use 'hg evolve' to update to its successor: f344982e63c4) |
333 $ echo 'gotta break' >> a |
335 $ echo 'gotta break' >> a |
334 $ hg amend |
336 $ hg amend |