diff mercurial/simplemerge.py @ 34324:e45ec589f962

discovery: avoid dropping remote heads hidden locally An extra post processing was added to recognize remote heads that are hidden locally as "common" instead of "unknown". However, this processing was removing such hidden heads from the remote heads sets. It had no impact because we used to pull phase information from all remote heads. This series will replace the phase pulling operation to a more efficient process but requires the unmodified pulled set information.
author Boris Feld <boris.feld@octobus.net>
date Wed, 20 Sep 2017 05:47:33 +0200
parents 6330df9d6393
children 93c4958d987c
line wrap: on
line diff