changeset 1620:6c61646fee5e

Adjusted all but one test output for the new behaviour of localrepo.changes()
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 12 Jan 2006 21:02:38 +0100
parents 1ba0d7041ac4
children ee16f06174bd
files tests/test-help.out tests/test-revert-unknown.out tests/test-symlinks tests/test-symlinks.out
diffstat 4 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-help.out	Thu Jan 12 13:58:36 2006 +0100
+++ b/tests/test-help.out	Thu Jan 12 21:02:38 2006 +0100
@@ -186,6 +186,7 @@
     M = modified
     A = added
     R = removed
+    ! = deleted, but still tracked
     ? = not tracked
 
 aliases: st
@@ -195,6 +196,7 @@
  -m --modified   show only modified files
  -a --added      show only added files
  -r --removed    show only removed files
+ -d --deleted    show only deleted (but tracked) files
  -u --unknown    show only unknown (not tracked) files
  -n --no-status  hide status prefix
  -0 --print0     end filenames with NUL, for use with xargs
--- a/tests/test-revert-unknown.out	Thu Jan 12 13:58:36 2006 +0100
+++ b/tests/test-revert-unknown.out	Thu Jan 12 21:02:38 2006 +0100
@@ -1,7 +1,7 @@
 %% Should show unknown
 ? unknown
 %% Should show unknown and b removed
-R b
+! b
 ? unknown
 %% Should show a and unknown
 a
--- a/tests/test-symlinks	Thu Jan 12 13:58:36 2006 +0100
+++ b/tests/test-symlinks	Thu Jan 12 21:02:38 2006 +0100
@@ -37,6 +37,6 @@
 mkdir dir/a.o
 ln -sf nonexist dir/b.o
 mkfifo a.c
-# it should show a.c, dir/a.o and dir/b.o removed
+# it should show a.c, dir/a.o and dir/b.o deleted
 hg status
 hg status a.c
--- a/tests/test-symlinks.out	Thu Jan 12 13:58:36 2006 +0100
+++ b/tests/test-symlinks.out	Thu Jan 12 21:02:38 2006 +0100
@@ -3,9 +3,9 @@
 adding a.c
 adding dir/a.o
 adding dir/b.o
-R a.c
-R dir/a.o
-R dir/b.o
+! a.c
+! dir/a.o
+! dir/b.o
 ? .hgignore
 a.c: unsupported file type (type is fifo)
-R a.c
+! a.c