Mercurial Mercurial > public > mercurial-scm > hg / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 21106 53433d8f1faa
parent 21071 19b9f23a8c6f
child 21140 4aeb8da68090
equal deleted inserted replaced
21105:12312f066d93 21106:53433d8f1faa 
  1166 
  1166 
  1167         elif fparent1 == nullid:
 
  1167         elif fparent1 == nullid:
 
  1168             fparent1, fparent2 = fparent2, nullid
 
  1168             fparent1, fparent2 = fparent2, nullid
 
  1169         elif fparent2 != nullid:
 
  1169         elif fparent2 != nullid:
 
  1170             # is one parent an ancestor of the other?
 
  1170             # is one parent an ancestor of the other?
 
  1171             fparentancestors = flog.commonancestors(fparent1, fparent2)
 
  1171             fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
 
  1172             if fparent1 in fparentancestors:
 
  1172             if fparent1 in fparentancestors:
 
  1173                 fparent1, fparent2 = fparent2, nullid
 
  1173                 fparent1, fparent2 = fparent2, nullid
 
  1174             elif fparent2 in fparentancestors:
 
  1174             elif fparent2 in fparentancestors:
 
  1175                 fparent2 = nullid
 
  1175                 fparent2 = nullid
 
  1176 
  1176
mercurial-scm/hg