# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1204852894 -3600
# Node ID 7d1aeda2d0ccd59251e55d65694269881ccc3988
# Parent  b69dca43ef085adc31c9972e028df4294cdce81b# Parent  439a24d34a1393f0ce95ecbcdcb8a6ae5c1ec0ee
Merge with stable

diff -r b69dca43ef08 -r 7d1aeda2d0cc hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Feb 15 17:57:45 2008 +0100
+++ b/hgkw/keyword.py	Fri Mar 07 02:21:34 2008 +0100
@@ -83,15 +83,15 @@
 from mercurial import commands, cmdutil, context, dispatch, filelog, revlog
 from mercurial import patch, localrepo, templater, templatefilters, util
 from mercurial.hgweb import webcommands
-from mercurial.node import *
+from mercurial.node import nullid, hex
 from mercurial.i18n import _
 import re, shutil, tempfile, time
 
 commands.optionalrepo += ' kwdemo'
 
 # hg commands that do not act on keywords
-nokwcommands = ('add addremove bundle copy export grep identify incoming init'
-                ' log outgoing push remove rename rollback tip'
+nokwcommands = ('add addremove bundle copy export grep incoming init'
+                ' log outgoing push rename rollback tip'
                 ' convert email glog')
 
 # hg commands that trigger expansion only when writing to working dir,
diff -r b69dca43ef08 -r 7d1aeda2d0cc tests/test-keyword
--- a/tests/test-keyword	Fri Feb 15 17:57:45 2008 +0100
+++ b/tests/test-keyword	Fri Mar 07 02:21:34 2008 +0100
@@ -67,6 +67,7 @@
 echo % status
 hg status
 echo % identify
+hg debugrebuildstate
 hg --quiet identify
 echo % cat
 cat a b
@@ -216,6 +217,7 @@
 echo
 
 echo % remove
+hg debugrebuildstate
 hg remove a
 hg --debug commit -m rma
 echo % status