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