diff -r c9d134165392 -r a1e91c24dab5 mercurial/hg.py --- a/mercurial/hg.py Thu Jun 23 17:37:47 2005 -0800 +++ b/mercurial/hg.py Thu Jun 23 17:43:04 2005 -0800 @@ -478,8 +478,8 @@ def rawcommit(self, files, text, user, date, p1=None, p2=None): orig_parent = self.dirstate.parents()[0] or nullid - p1 = (p1 and self.lookup(p1)) or self.dirstate.parents()[0] or nullid - p2 = (p2 and self.lookup(p2)) or self.dirstate.parents()[1] or nullid + p1 = p1 or self.dirstate.parents()[0] or nullid + p2 = p2 or self.dirstate.parents()[1] or nullid c1 = self.changelog.read(p1) c2 = self.changelog.read(p2) m1 = self.manifest.read(c1[0])