tests/test-simplemerge.py.out
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 05 Apr 2019 15:56:05 +0200
changeset 42129 232a33a11ce0
parent 22023 f18830651811
permissions -rw-r--r--
pull: deal with locally filtered changeset passed into --rev Nowadays, it is possible to explicitly pull a remote revision that end up being hidden locally (eg: obsoleted locally). However before this patch, some internal processing where crashing trying to resolve a filtered revision. Without this patches, the pull output result a confusing output: $ hg pull ../repo-Bob --rev 956063ac4557 pulling from ../repo-Bob searching for changes adding changesets adding manifests adding file changes added 2 changesets with 0 changes to 2 files (+1 heads) (2 other changesets obsolete on arrival) abort: 00changelog.i@956063ac4557828781733b2d5677a351ce856f59: filtered node!

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK