Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/merge.py @ 3202:9e002614f2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor nullid cleanup
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 17:50:59 -0500
parents e67c22bc8bba
children 3fd098e0902d
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -380,7 +380,7 @@ def update(repo, node, branchmerge=False
         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)