Show More
@@ -487,3 +487,55 b' decision is made in that case, so receiv' | |||||
487 | ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'bob'} |
|
487 | ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'bob'} | |
488 |
|
488 | |||
489 | $ cd .. |
|
489 | $ cd .. | |
|
490 | ||||
|
491 | Test pull report consistency | |||
|
492 | ============================ | |||
|
493 | ||||
|
494 | obsolete but visible should be reported | |||
|
495 | --------------------------------------- | |||
|
496 | ||||
|
497 | Setup | |||
|
498 | ||||
|
499 | $ hg init repo-a | |||
|
500 | $ cat << EOF >> repo-a/.hg/hgrc | |||
|
501 | > [ui] | |||
|
502 | > username=test | |||
|
503 | > EOF | |||
|
504 | $ cd repo-a | |||
|
505 | $ hg debugbuilddag .. | |||
|
506 | $ hg debugobsolete `getid tip` | |||
|
507 | obsoleted 1 changesets | |||
|
508 | $ cd ../ | |||
|
509 | $ hg clone --pull repo-a repo-b | |||
|
510 | requesting all changes | |||
|
511 | adding changesets | |||
|
512 | adding manifests | |||
|
513 | adding file changes | |||
|
514 | added 1 changesets with 0 changes to 0 files | |||
|
515 | new changesets 1ea73414a91b (1 drafts) | |||
|
516 | updating to branch default | |||
|
517 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
518 | $ hg -R repo-a up tip --hidden | |||
|
519 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
520 | updated to hidden changeset 66f7d451a68b | |||
|
521 | (hidden revision '66f7d451a68b' is pruned) | |||
|
522 | $ hg -R repo-a branch foo | |||
|
523 | marked working directory as branch foo | |||
|
524 | (branches are permanent and global, did you want a bookmark?) | |||
|
525 | $ hg -R repo-a commit -m foo | |||
|
526 | 1 new orphan changesets | |||
|
527 | ||||
|
528 | Actual test | |||
|
529 | (BROKEN) | |||
|
530 | ||||
|
531 | $ hg -R repo-b pull | |||
|
532 | pulling from $TESTTMP/distributed-chain-building/distributed-chain-building/repo-a | |||
|
533 | searching for changes | |||
|
534 | adding changesets | |||
|
535 | adding manifests | |||
|
536 | adding file changes | |||
|
537 | added 2 changesets with 0 changes to 0 files | |||
|
538 | 1 new obsolescence markers | |||
|
539 | 1 new orphan changesets | |||
|
540 | new changesets 95d586532b49 (1 drafts) | |||
|
541 | (run 'hg update' to get a working copy) |
General Comments 0
You need to be logged in to leave comments.
Login now