# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1173276417 -3600
# Node ID d8515e3742042542d5bcd57a7a389ad1f144dfbe
# Parent  4c714ed245d6b168674df955fd325acaa2fc68bd# Parent  bfeff6dcac7a64fdddc5557849343450fd29ac9a
merge with crew-stable

diff -r 4c714ed245d6 -r d8515e374204 mercurial/commands.py
--- a/mercurial/commands.py	Tue Mar 06 17:45:50 2007 -0300
+++ b/mercurial/commands.py	Wed Mar 07 15:06:57 2007 +0100
@@ -2885,7 +2885,7 @@
           ('d', 'deleted', None, _('show only deleted (but tracked) files')),
           ('c', 'clean', None, _('show only files without changes')),
           ('u', 'unknown', None, _('show only unknown (not tracked) files')),
-          ('i', 'ignored', None, _('show ignored files')),
+          ('i', 'ignored', None, _('show only ignored files')),
           ('n', 'no-status', None, _('hide status prefix')),
           ('C', 'copies', None, _('show source of copied files')),
           ('0', 'print0', None,
diff -r 4c714ed245d6 -r d8515e374204 tests/test-help.out
--- a/tests/test-help.out	Tue Mar 06 17:45:50 2007 -0300
+++ b/tests/test-help.out	Wed Mar 07 15:06:57 2007 +0100
@@ -236,7 +236,7 @@
  -d --deleted    show only deleted (but tracked) files
  -c --clean      show only files without changes
  -u --unknown    show only unknown (not tracked) files
- -i --ignored    show ignored files
+ -i --ignored    show only ignored files
  -n --no-status  hide status prefix
  -C --copies     show source of copied files
  -0 --print0     end filenames with NUL, for use with xargs
diff -r 4c714ed245d6 -r d8515e374204 tests/test-notify
--- a/tests/test-notify	Tue Mar 06 17:45:50 2007 -0300
+++ b/tests/test-notify	Wed Mar 07 15:06:57 2007 +0100
@@ -33,7 +33,7 @@
 
 echo '% pull (minimal config)'
 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
-  -e 's/changeset \([0-9a-f]* \)*in .*test-notif/changeset \1in test-notif/' \
+  -e 's/changeset \([0-9a-f]* *\)in .*test-notif/changeset \1in test-notif/' \
   -e 's/^details: .*test-notify/details: test-notify/'
 
 cat <<EOF >> $HGRCPATH