Submitter | Pierre-Yves David |
---|---|
Date | Jan. 7, 2014, 1:38 a.m. |
Message ID | <4dcd2535942b73c76560.1389058703@marginatus.fb.com> |
Download | mbox | patch |
Permalink | /patch/3261/ |
State | Accepted |
Commit | 44182a81c5a40c36d63ae1b41afbdc4ba86b3670 |
Headers | show |
Comments
Patch
diff --git a/mercurial/branchmap.py b/mercurial/branchmap.py --- a/mercurial/branchmap.py +++ b/mercurial/branchmap.py @@ -261,12 +261,11 @@ class branchcache(dict): # heads because an existing head is their descendant. while iterrevs: latest = iterrevs.pop() if latest not in bheadrevs: continue - ancestors = set(cl.ancestors([latest], - bheadrevs[0])) + ancestors = set(cl.ancestors([latest], bheadrevs[0])) if ancestors: bheadrevs = [b for b in bheadrevs if b not in ancestors] self[branch] = [cl.node(rev) for rev in bheadrevs] tiprev = max(bheadrevs) if tiprev > self.tiprev: