equal
deleted
inserted
replaced
202 |
202 |
203 $ hg branch -r . foobar |
203 $ hg branch -r . foobar |
204 changed branch on 1 changesets |
204 changed branch on 1 changesets |
205 |
205 |
206 $ hg up c41c793e0ef1 --hidden |
206 $ hg up c41c793e0ef1 --hidden |
|
207 updating to a hidden changeset c41c793e0ef1 |
|
208 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
207 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
209 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
208 updated to hidden changeset c41c793e0ef1 |
|
209 (hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48) |
|
210 working directory parent is obsolete! (c41c793e0ef1) |
210 working directory parent is obsolete! (c41c793e0ef1) |
211 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
211 (use 'hg evolve' to update to its successor: 9e5dffcb3d48) |
212 $ echo bar > d |
212 $ echo bar > d |
213 $ hg branch watwat |
213 $ hg branch watwat |
214 marked working directory as branch watwat |
214 marked working directory as branch watwat |
308 |
308 |
309 $ echo foo > d |
309 $ echo foo > d |
310 $ hg amend -m "foo to d" |
310 $ hg amend -m "foo to d" |
311 |
311 |
312 $ hg up a9d6fd6b5e40 --hidden |
312 $ hg up a9d6fd6b5e40 --hidden |
|
313 updating to a hidden changeset a9d6fd6b5e40 |
|
314 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
313 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
314 updated to hidden changeset a9d6fd6b5e40 |
|
315 (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1) |
|
316 working directory parent is obsolete! (a9d6fd6b5e40) |
316 working directory parent is obsolete! (a9d6fd6b5e40) |
317 (use 'hg evolve' to update to its successor: b10b07a394f1) |
317 (use 'hg evolve' to update to its successor: b10b07a394f1) |
318 $ echo babar > d |
318 $ echo babar > d |
319 $ hg amend -m "foo to d" |
319 $ hg amend -m "foo to d" |
320 2 new content-divergent changesets |
320 2 new content-divergent changesets |
368 |
368 |
369 $ echo bar > d |
369 $ echo bar > d |
370 $ hg amend -m "bar to d, expect beers" |
370 $ hg amend -m "bar to d, expect beers" |
371 |
371 |
372 $ hg up 11175423b5dc --hidden |
372 $ hg up 11175423b5dc --hidden |
|
373 updating to a hidden changeset 11175423b5dc |
|
374 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
373 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
374 updated to hidden changeset 11175423b5dc |
|
375 (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a) |
|
376 working directory parent is obsolete! (11175423b5dc) |
376 working directory parent is obsolete! (11175423b5dc) |
377 (use 'hg evolve' to update to its successor: 27f0463f169a) |
377 (use 'hg evolve' to update to its successor: 27f0463f169a) |
378 $ echo wat > d |
378 $ echo wat > d |
379 $ hg amend -m "wat to d, wat?" |
379 $ hg amend -m "wat to d, wat?" |
380 2 new content-divergent changesets |
380 2 new content-divergent changesets |
478 o 0:6569b5a81c7e@default(public) bk:[] root |
478 o 0:6569b5a81c7e@default(public) bk:[] root |
479 |
479 |
480 $ echo 'babar' >> a |
480 $ echo 'babar' >> a |
481 $ hg amend |
481 $ hg amend |
482 $ hg up --hidden 'min(desc("More addition"))' |
482 $ hg up --hidden 'min(desc("More addition"))' |
|
483 updating to a hidden changeset 867e43582046 |
|
484 (hidden revision '867e43582046' was rewritten as: fc6349f931da) |
483 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
485 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
484 updated to hidden changeset 867e43582046 |
|
485 (hidden revision '867e43582046' was rewritten as: fc6349f931da) |
|
486 working directory parent is obsolete! (867e43582046) |
486 working directory parent is obsolete! (867e43582046) |
487 (use 'hg evolve' to update to its successor: fc6349f931da) |
487 (use 'hg evolve' to update to its successor: fc6349f931da) |
488 $ mv a a.old |
488 $ mv a a.old |
489 $ echo 'jungle' > a |
489 $ echo 'jungle' > a |
490 $ cat a.old >> a |
490 $ cat a.old >> a |
571 Check conflict during content-divergence resolution |
571 Check conflict during content-divergence resolution |
572 --------------------------------------------------- |
572 --------------------------------------------------- |
573 |
573 |
574 |
574 |
575 $ hg up --hidden 'min(desc("More addition"))' |
575 $ hg up --hidden 'min(desc("More addition"))' |
|
576 updating to a hidden changeset 867e43582046 |
|
577 (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) |
576 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
578 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
577 updated to hidden changeset 867e43582046 |
|
578 (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1) |
|
579 working directory parent is obsolete! (867e43582046) |
579 working directory parent is obsolete! (867e43582046) |
580 (use 'hg evolve' to update to its successor: 5bf84d1d71d1) |
580 (use 'hg evolve' to update to its successor: 5bf84d1d71d1) |
581 $ echo 'gotta break' >> a |
581 $ echo 'gotta break' >> a |
582 $ hg amend |
582 $ hg amend |
583 2 new content-divergent changesets |
583 2 new content-divergent changesets |
748 > VIII |
748 > VIII |
749 > IX |
749 > IX |
750 > EOF |
750 > EOF |
751 $ hg commit --amend -m E2 |
751 $ hg commit --amend -m E2 |
752 $ hg --hidden update -r 'desc(E1)' |
752 $ hg --hidden update -r 'desc(E1)' |
|
753 updating to a hidden changeset 4a250e5bd992 |
|
754 (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) |
753 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
755 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
754 updated to hidden changeset 4a250e5bd992 |
|
755 (hidden revision '4a250e5bd992' was rewritten as: 084ae625fa51) |
|
756 working directory parent is obsolete! (4a250e5bd992) |
756 working directory parent is obsolete! (4a250e5bd992) |
757 (use 'hg evolve' to update to its successor: 084ae625fa51) |
757 (use 'hg evolve' to update to its successor: 084ae625fa51) |
758 $ cat << EOF > numbers |
758 $ cat << EOF > numbers |
759 > one |
759 > one |
760 > 2 |
760 > 2 |