Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/merge.py @ 23405:2a038deeac9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: 0 is a valid ancestor different from None Most internal functions can take either a hash or an integer. Merge did however not handle 0 as revision 0. Now it does.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 30 Nov 2014 19:26:53 +0100
parents 9da5a7413eb8
children cd9e5e57064d
comparison
equal deleted inserted replaced
23404:b913c394386f 23405:2a038deeac9a
966 try: 966 try:
967 wc = repo[None] 967 wc = repo[None]
968 pl = wc.parents() 968 pl = wc.parents()
969 p1 = pl[0] 969 p1 = pl[0]
970 pas = [None] 970 pas = [None]
971 if ancestor: 971 if ancestor is not None:
972 pas = [repo[ancestor]] 972 pas = [repo[ancestor]]
973 973
974 if node is None: 974 if node is None:
975 # Here is where we should consider bookmarks, divergent bookmarks, 975 # Here is where we should consider bookmarks, divergent bookmarks,
976 # foreground changesets (successors), and tip of current branch; 976 # foreground changesets (successors), and tip of current branch;