changeset 5238:2b8373bda032

merge with crew-stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 24 Aug 2007 00:56:56 +0200
parents 5b1f5a143c8b (current diff) 74723744d8e0 (diff)
children 85ba6ab5bd3a 9cd6578750b9
files
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-permissions	Fri Aug 24 00:53:16 2007 +0200
+++ b/tests/test-permissions	Fri Aug 24 00:56:56 2007 +0200
@@ -14,4 +14,4 @@
 echo barber > a
 hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed
 chmod -w ../t
-hg diff
+hg diff --nodates
--- a/tests/test-permissions.out	Fri Aug 24 00:53:16 2007 +0200
+++ b/tests/test-permissions.out	Fri Aug 24 00:56:56 2007 +0200
@@ -14,3 +14,9 @@
 checking files
 1 files, 1 changesets, 1 total revisions
 commit failed
+diff -r c1fab96507ef a
+--- a/a
++++ b/a
+@@ -1,1 +1,1 @@ foo
+-foo
++barber