Show More
@@ -4503,7 +4503,10 b' def pull(ui, repo, source="default", **o' | |||||
4503 | try: |
|
4503 | try: | |
4504 | ret = postincoming(ui, repo, modheads, opts.get('update'), |
|
4504 | ret = postincoming(ui, repo, modheads, opts.get('update'), | |
4505 | checkout, brev) |
|
4505 | checkout, brev) | |
4506 |
|
4506 | except error.FilteredRepoLookupError as exc: | ||
|
4507 | msg = _('cannot update to target: %s') % exc.args[0] | |||
|
4508 | exc.args = (msg,) + exc.args[1:] | |||
|
4509 | raise | |||
4507 | finally: |
|
4510 | finally: | |
4508 | del repo._subtoppath |
|
4511 | del repo._subtoppath | |
4509 |
|
4512 |
@@ -504,6 +504,21 b' X` has to process a X that is filtered l' | |||||
504 | (2 other changesets obsolete on arrival) |
|
504 | (2 other changesets obsolete on arrival) | |
505 | (run 'hg heads' to see heads) |
|
505 | (run 'hg heads' to see heads) | |
506 |
|
506 | |||
|
507 | With --update | |||
|
508 | ||||
|
509 | $ hg rollback | |||
|
510 | repository tip rolled back to revision 4 (undo pull) | |||
|
511 | $ hg pull ../repo-Bob --rev 956063ac4557 --update | |||
|
512 | pulling from ../repo-Bob | |||
|
513 | searching for changes | |||
|
514 | adding changesets | |||
|
515 | adding manifests | |||
|
516 | adding file changes | |||
|
517 | added 2 changesets with 0 changes to 2 files (+1 heads) | |||
|
518 | (2 other changesets obsolete on arrival) | |||
|
519 | abort: cannot update to target: filtered revision '6'! | |||
|
520 | [255] | |||
|
521 | ||||
507 |
$ |
|
522 | $ cd .. | |
508 |
|
523 | |||
509 | Test pull report consistency |
|
524 | Test pull report consistency |
General Comments 0
You need to be logged in to leave comments.
Login now