Submitter | Mads Kiilerich |
---|---|
Date | April 17, 2014, 6:07 p.m. |
Message ID | <53433d8f1faa14193e5d.1397758078@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/4400/ |
State | Accepted |
Commit | 53433d8f1faa14193e5d6eb2f669f85072065cd1 |
Headers | show |
Comments
Patch
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1168,7 +1168,7 @@ class localrepository(object): fparent1, fparent2 = fparent2, nullid elif fparent2 != nullid: # is one parent an ancestor of the other? - fparentancestors = flog.commonancestors(fparent1, fparent2) + fparentancestors = flog.commonancestorsheads(fparent1, fparent2) if fparent1 in fparentancestors: fparent1, fparent2 = fparent2, nullid elif fparent2 in fparentancestors: