Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 42129:232a33a11ce0
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!
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 05 Apr 2019 15:56:05 +0200 |
parents | d6437f414437 |
children | a362b0b95e42 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Apr 15 22:13:11 2019 -0700 +++ b/mercurial/commands.py Fri Apr 05 15:56:05 2019 +0200 @@ -4488,7 +4488,7 @@ brev = None if checkout: - checkout = repo.changelog.rev(checkout) + checkout = repo.unfiltered().changelog.rev(checkout) # order below depends on implementation of # hg.addbranchrevs(). opts['bookmark'] is ignored,