# HG changeset patch # User Pierre-Yves David # Date 2013-09-30 13:52:37 # Node ID c38eaeb3b45e3ea3428465fb78f6413b2c2bfee1 # Parent e7c0e5f81367b386befc2ed6714933113d05b307 branchmap: fix blank line position The blank line was after was after the `if` condition instead of before. diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -210,8 +210,8 @@ class branchcache(dict): if not nodes: droppednodes.extend(nodes) del self[branch] + if ((not self.validfor(repo)) or (self.tipnode in droppednodes)): - # cache key are not valid anymore self.tipnode = nullid self.tiprev = nullrev