--- a/hgext/keyword.py Thu Jun 03 13:58:00 2010 +0200
+++ b/hgext/keyword.py Thu Jun 03 10:37:31 2010 +0100
@@ -81,7 +81,6 @@
from mercurial import commands, cmdutil, dispatch, filelog, revlog, extensions
from mercurial import patch, localrepo, templater, templatefilters, util, match
from mercurial.hgweb import webcommands
-from mercurial.node import nullid
from mercurial.i18n import _
import re, shutil, tempfile
@@ -287,7 +286,7 @@
def _kwfwrite(ui, repo, expand, *pats, **opts):
'''Selects files and passes them to kwtemplater.overwrite.'''
- if repo.dirstate.parents()[1] != nullid:
+ if len(repo[None].parents()) > 1:
raise util.Abort(_('outstanding uncommitted merge'))
kwt = kwtools['templater']
wlock = repo.wlock()