Mercurial > hg
diff mercurial/filemerge.py @ 18498:4d9f7dd2ac82 stable
pull: fix crash when pulling changeset that get hidden locally (issue3788)
When you have obsolescence marker that apply to a pulled changesets, the added
changeset is immediately filtered. Then the list of added changeset needs to be
build against and unfiltered repo.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 29 Jan 2013 15:26:10 +0100 |
parents | 297bf69966a0 |
children | c58b6ab4c26f |