Mercurial Mercurial > mercurial / 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/merge.py
changeset 32612 a8262b7784f9
parent 32498 bd56bea5ecf8
child 32641 49e1e5acb8ff
equal deleted inserted replaced
32611:954489932c4f 32612:a8262b7784f9 
   799 
   799 
   800     copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
 
   800     copy, movewithdir, diverge, renamedelete, dirmove = {}, {}, {}, {}, {}
 
   801 
   801 
   802     # manifests fetched in order are going to be faster, so prime the caches
 
   802     # manifests fetched in order are going to be faster, so prime the caches
 
   803     [x.manifest() for x in
 
   803     [x.manifest() for x in
 
   804      sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())]
 
   804      sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev() or -1)]
 
   805 
   805 
   806     if followcopies:
 
   806     if followcopies:
 
   807         ret = copies.mergecopies(repo, wctx, p2, pa)
 
   807         ret = copies.mergecopies(repo, wctx, p2, pa)
 
   808         copy, movewithdir, diverge, renamedelete, dirmove = ret
 
   808         copy, movewithdir, diverge, renamedelete, dirmove = ret
 
   809 
   809
mercurial