equal
deleted
inserted
replaced
237 o 0:07f494440405@default(public) bk:[] adda |
237 o 0:07f494440405@default(public) bk:[] adda |
238 |
238 |
239 $ echo 'babar' >> a |
239 $ echo 'babar' >> a |
240 $ hg amend |
240 $ hg amend |
241 $ hg up --hidden 3932c176bbaa |
241 $ hg up --hidden 3932c176bbaa |
242 updating to a hidden changeset 3932c176bbaa |
242 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
243 updated to hidden changeset 3932c176bbaa |
243 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) |
244 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) |
244 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
245 working directory parent is obsolete! (3932c176bbaa) |
245 working directory parent is obsolete! (3932c176bbaa) |
246 (use 'hg evolve' to update to its successor: d2f173e25686) |
246 (use 'hg evolve' to update to its successor: d2f173e25686) |
247 $ mv a a.old |
247 $ mv a a.old |
248 $ echo 'jungle' > a |
248 $ echo 'jungle' > a |
249 $ cat a.old >> a |
249 $ cat a.old >> a |
347 |
347 |
348 Check conflict during divergence resolution |
348 Check conflict during divergence resolution |
349 ------------------------------------------------- |
349 ------------------------------------------------- |
350 |
350 |
351 $ hg up --hidden 3932c176bbaa |
351 $ hg up --hidden 3932c176bbaa |
352 updating to a hidden changeset 3932c176bbaa |
352 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
353 updated to hidden changeset 3932c176bbaa |
353 (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) |
354 (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) |
354 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
355 working directory parent is obsolete! (3932c176bbaa) |
355 working directory parent is obsolete! (3932c176bbaa) |
356 (use 'hg evolve' to update to its successor: f344982e63c4) |
356 (use 'hg evolve' to update to its successor: f344982e63c4) |
357 $ echo 'gotta break' >> a |
357 $ echo 'gotta break' >> a |
358 $ hg amend |
358 $ hg amend |
359 2 new content-divergent changesets |
359 2 new content-divergent changesets |