Mercurial > hg
diff mercurial/repoview.py @ 18250:f54898526aad
hidden: use both parents of working directory
If we are merging with and extinct revision, this extinct revision should not be
hidden.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 08 Jan 2013 17:31:00 +0100 |
| parents | 378a025ff269 |
| children | 95ef7a87c053 |
line wrap: on
line diff
--- a/mercurial/repoview.py Tue Jan 08 14:16:49 2013 +0100 +++ b/mercurial/repoview.py Tue Jan 08 17:31:00 2013 +0100 @@ -18,7 +18,7 @@ assert not repo.changelog.filteredrevs if repo.obsstore: ### hide extinct changeset that are not accessible by any mean - hiddenquery = 'extinct() - ::(. + bookmark())' + hiddenquery = 'extinct() - ::(parents() + bookmark())' return frozenset(repo.revs(hiddenquery)) return frozenset()