Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor nullid cleanup
authorMatt Mackall <mpm@selenic.com>
Fri, 29 Sep 2006 17:50:59 -0500
changeset 3169 9e002614f2eb
parent 3168 05c588e1803d
child 3203 14792adabf80
merge: minor nullid cleanup
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Fri Sep 29 17:47:51 2006 -0500
+++ b/mercurial/merge.py	Fri Sep 29 17:50:59 2006 -0500
@@ -380,7 +380,7 @@
         p1, p2 = p2, repo.changectx(nullid)
 
     xp1, xp2 = str(p1), str(p2)
-    if p2.node() == nullid: xp2 = ''
+    if not p2: xp2 = ''
 
     repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
Mercurial