equal
deleted
inserted
replaced
204 |
204 |
205 $ hg branch -r . foobar |
205 $ hg branch -r . foobar |
206 changed branch on 1 changesets |
206 changed branch on 1 changesets |
207 |
207 |
208 $ hg up c41c793e0ef1 --hidden |
208 $ hg up c41c793e0ef1 --hidden |
|
209 updating to a hidden changeset c41c793e0ef1 |
|
210 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
209 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
211 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
210 updated to hidden changeset c41c793e0ef1 |
|
211 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
|
212 working directory parent is obsolete! (c41c793e0ef1) |
212 working directory parent is obsolete! (c41c793e0ef1) |
213 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
213 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
214 $ echo bar > d |
214 $ echo bar > d |
215 $ hg branch watwat |
215 $ hg branch watwat |
216 marked working directory as branch watwat |
216 marked working directory as branch watwat |
312 |
312 |
313 $ echo foo > d |
313 $ echo foo > d |
314 $ hg amend -m "foo to d" |
314 $ hg amend -m "foo to d" |
315 |
315 |
316 $ hg up a9d6fd6b5e40 --hidden |
316 $ hg up a9d6fd6b5e40 --hidden |
|
317 updating to a hidden changeset a9d6fd6b5e40 |
|
318 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
319 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 updated to hidden changeset a9d6fd6b5e40 |
|
319 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
|
320 working directory parent is obsolete! (a9d6fd6b5e40) |
320 working directory parent is obsolete! (a9d6fd6b5e40) |
321 (use 'hg evolve' to update to its successor: b10b07a394f1) |
321 (use 'hg evolve' to update to its successor: b10b07a394f1) |
322 $ echo babar > d |
322 $ echo babar > d |
323 $ hg amend -m "foo to d" |
323 $ hg amend -m "foo to d" |
324 2 new content-divergent changesets |
324 2 new content-divergent changesets |
372 |
372 |
373 $ echo bar > d |
373 $ echo bar > d |
374 $ hg amend -m "bar to d, expect beers" |
374 $ hg amend -m "bar to d, expect beers" |
375 |
375 |
376 $ hg up 11175423b5dc --hidden |
376 $ hg up 11175423b5dc --hidden |
|
377 updating to a hidden changeset 11175423b5dc |
|
378 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
377 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
379 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
378 updated to hidden changeset 11175423b5dc |
|
379 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
|
380 working directory parent is obsolete! (11175423b5dc) |
380 working directory parent is obsolete! (11175423b5dc) |
381 (use 'hg evolve' to update to its successor: 27f0463f169a) |
381 (use 'hg evolve' to update to its successor: 27f0463f169a) |
382 $ echo wat > d |
382 $ echo wat > d |
383 $ hg amend -m "wat to d, wat?" |
383 $ hg amend -m "wat to d, wat?" |
384 2 new content-divergent changesets |
384 2 new content-divergent changesets |
482 o 0:6569b5a81c7e@default(public) bk:[] root |
482 o 0:6569b5a81c7e@default(public) bk:[] root |
483 |
483 |
484 $ echo 'babar' >> a |
484 $ echo 'babar' >> a |
485 $ hg amend |
485 $ hg amend |
486 $ hg up --hidden 'min(desc("More addition"))' |
486 $ hg up --hidden 'min(desc("More addition"))' |
|
487 updating to a hidden changeset 867e43582046 |
|
488 (hidden revision '867e43582046' was rewritten as: fc6349f931da) |
487 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
489 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
488 updated to hidden changeset 867e43582046 |
|
489 (hidden revision '867e43582046' was rewritten as: fc6349f931da) |
|
490 working directory parent is obsolete! (867e43582046) |
490 working directory parent is obsolete! (867e43582046) |
491 (use 'hg evolve' to update to its successor: fc6349f931da) |
491 (use 'hg evolve' to update to its successor: fc6349f931da) |
492 $ mv a a.old |
492 $ mv a a.old |
493 $ echo 'jungle' > a |
493 $ echo 'jungle' > a |
494 $ cat a.old >> a |
494 $ cat a.old >> a |
575 Check conflict during content-divergence resolution |
575 Check conflict during content-divergence resolution |
576 --------------------------------------------------- |
576 --------------------------------------------------- |
577 |
577 |
578 |
578 |
579 $ hg up --hidden 'min(desc("More addition"))' |
579 $ hg up --hidden 'min(desc("More addition"))' |
|
580 updating to a hidden changeset 867e43582046 |
|
581 (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) |
580 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
582 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
581 updated to hidden changeset 867e43582046 |
|
582 (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) |
|
583 working directory parent is obsolete! (867e43582046) |
583 working directory parent is obsolete! (867e43582046) |
584 (use 'hg evolve' to update to its successor: 5bf84d1d71d1) |
584 (use 'hg evolve' to update to its successor: 5bf84d1d71d1) |
585 $ echo 'gotta break' >> a |
585 $ echo 'gotta break' >> a |
586 $ hg amend |
586 $ hg amend |
587 2 new content-divergent changesets |
587 2 new content-divergent changesets |
752 > VIII |
752 > VIII |
753 > IX |
753 > IX |
754 > EOF |
754 > EOF |
755 $ hg commit --amend -m E2 |
755 $ hg commit --amend -m E2 |
756 $ hg --hidden update -r 'desc(E1)' |
756 $ hg --hidden update -r 'desc(E1)' |
|
757 updating to a hidden changeset 4a250e5bd992 |
|
758 (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) |
757 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
759 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
758 updated to hidden changeset 4a250e5bd992 |
|
759 (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) |
|
760 working directory parent is obsolete! (4a250e5bd992) |
760 working directory parent is obsolete! (4a250e5bd992) |
761 (use 'hg evolve' to update to its successor: 084ae625fa51) |
761 (use 'hg evolve' to update to its successor: 084ae625fa51) |
762 $ cat << EOF > numbers |
762 $ cat << EOF > numbers |
763 > one |
763 > one |
764 > 2 |
764 > 2 |