diff mercurial/graphmod.py @ 20280:95b9c6149e17

merge: consider successor changesets for a bare update Previously, a bare update would ignore any successor changesets thus potentially leaving you on an obsolete head. This happens commonly when there is an old bookmark that hasn't been moved forward which is the motivating reason for this patch series. Now, we will check for successor changesets if two conditions hold: 1) we are doing a bare update 2) *and* we are currently on an obsolete head. If we are in this situation, then we calculate the branchtip of the successor set and update to that changeset. Tests coverage has been added.
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 15 Jan 2014 16:41:18 -0600
parents e441657b372b
children e87bd3485a07
line wrap: on
line diff