##// END OF EJS Templates
pull: deal with locally filtered changeset passed into --rev...
marmoute -
r42298:232a33a1 default
parent child Browse files
Show More
@@ -4488,7 +4488,7 b' def pull(ui, repo, source="default", **o'
4488 brev = None
4488 brev = None
4489
4489
4490 if checkout:
4490 if checkout:
4491 checkout = repo.changelog.rev(checkout)
4491 checkout = repo.unfiltered().changelog.rev(checkout)
4492
4492
4493 # order below depends on implementation of
4493 # order below depends on implementation of
4494 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4494 # hg.addbranchrevs(). opts['bookmark'] is ignored,
@@ -488,6 +488,22 b' decision is made in that case, so receiv'
488 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'bob'}
488 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'bob'}
489 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'bob'}
489 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'bob'}
490
490
491
492 Same tests, but with --rev, this prevent regressing case where `hg pull --rev
493 X` has to process a X that is filtered locally.
494
495 $ hg rollback
496 repository tip rolled back to revision 4 (undo unbundle)
497 $ hg pull ../repo-Bob --rev 956063ac4557
498 pulling from ../repo-Bob
499 searching for changes
500 adding changesets
501 adding manifests
502 adding file changes
503 added 2 changesets with 0 changes to 2 files (+1 heads)
504 (2 other changesets obsolete on arrival)
505 (run 'hg heads' to see heads)
506
491 $ cd ..
507 $ cd ..
492
508
493 Test pull report consistency
509 Test pull report consistency
General Comments 0
You need to be logged in to leave comments. Login now