# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1218100834 -7200
# Node ID d06af25db8ca77ae8c1063e1a987c807c4af56de
# Parent  3989df387ff721bc31ea4c27ad9e16c82e614e18# Parent  18f235294dda58f5f5c1f8fd493bcc0eb840ab67
(stable) merge with default

diff -r 3989df387ff7 -r d06af25db8ca hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Jun 27 18:28:45 2008 -0500
+++ b/hgkw/keyword.py	Thu Aug 07 11:20:34 2008 +0200
@@ -91,7 +91,7 @@
 
 # hg commands that do not act on keywords
 nokwcommands = ('add addremove annotate bundle copy export grep incoming init'
-                ' log outgoing push rename rollback tip'
+                ' log outgoing push rename rollback tip verify'
                 ' convert email glog')
 
 # hg commands that trigger expansion only when writing to working dir,
diff -r 3989df387ff7 -r d06af25db8ca tests/test-keyword
--- a/tests/test-keyword	Fri Jun 27 18:28:45 2008 -0500
+++ b/tests/test-keyword	Thu Aug 07 11:20:34 2008 +0200
@@ -208,6 +208,8 @@
 rm log
 echo % status
 hg status
+echo % verify
+hg verify
 
 echo % cat
 cat a b
diff -r 3989df387ff7 -r d06af25db8ca tests/test-keyword.out
--- a/tests/test-keyword.out	Fri Jun 27 18:28:45 2008 -0500
+++ b/tests/test-keyword.out	Thu Aug 07 11:20:34 2008 +0200
@@ -281,6 +281,12 @@
 a
 overwriting a expanding keywords
 % status
+% verify
+checking changesets
+checking manifests
+crosschecking files in changesets and manifests
+checking files
+3 files, 3 changesets, 4 total revisions
 % cat
 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id: