# HG changeset patch # User Yuya Nishihara # Date 2018-10-13 08:58:06 # Node ID d99a588d8515ee07a5e2ddb9e715fb8c6cc45b38 # Parent 58d785679e158dcf460df8cffc32b7be4b36ea83 py3: pass in system string to vars(branchmap).__contains__() diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -480,7 +480,7 @@ class revbranchcache(object): # self.branchinfo = self._branchinfo # # Since we now have data in the cache, we need to drop this bypassing. - if 'branchinfo' in vars(self): + if r'branchinfo' in vars(self): del self.branchinfo def _setcachedata(self, rev, node, branchidx):