# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1142403313 -3600
# Node ID f92cf4a8cedd42c0257b65a27b37804592d349ee
# Parent  295010327271f7925e46505379110544bb7f2dd2# Parent  34d0e2e559ff56b2d74093ec34404f83337b0326
merge with crew

diff -r 295010327271 -r f92cf4a8cedd mercurial/util.py
--- a/mercurial/util.py	Wed Mar 15 07:10:04 2006 +0100
+++ b/mercurial/util.py	Wed Mar 15 07:15:13 2006 +0100
@@ -742,7 +742,7 @@
         tz = time.timezone
     return time.mktime(lt), tz
 
-def datestr(date=None, format='%c'):
+def datestr(date=None, format='%a %b %d %H:%M:%S %Y'):
     """represent a (unixtime, offset) tuple as a localized time.
     unixtime is seconds since the epoch, and offset is the time zone's
     number of seconds away from UTC."""
diff -r 295010327271 -r f92cf4a8cedd tests/test-remove
--- a/tests/test-remove	Wed Mar 15 07:10:04 2006 +0100
+++ b/tests/test-remove	Wed Mar 15 07:15:13 2006 +0100
@@ -8,10 +8,10 @@
 rm foo
 hg remove foo
 hg commit -m 2 -d "1000000 0"
-hg export 0 | sed -e "s/Thu Jan 01/Thu Jan  1/"
-hg export 1 | sed -e "s/Thu Jan 01/Thu Jan  1/"
-hg log -p -r 0 | sed -e "s/Thu Jan 01/Thu Jan  1/"
-hg log -p -r 1 | sed -e "s/Thu Jan 01/Thu Jan  1/"
+hg export 0
+hg export 1
+hg log -p -r 0
+hg log -p -r 1
 
 cd ..
 hg clone a b
diff -r 295010327271 -r f92cf4a8cedd tests/test-remove.out
--- a/tests/test-remove.out	Wed Mar 15 07:10:04 2006 +0100
+++ b/tests/test-remove.out	Wed Mar 15 07:15:13 2006 +0100
@@ -5,7 +5,7 @@
 1
 
 diff -r 000000000000 -r 8ba83d44753d foo
---- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:40 1970 +0000
 @@ -0,0 +1,1 @@
 +a
@@ -17,7 +17,7 @@
 
 diff -r 8ba83d44753d -r a1fce69c50d9 foo
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ /dev/null	Thu Jan  1 00:00:00 1970 +0000
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +0,0 @@
 -a
 changeset:   0:8ba83d44753d
@@ -26,7 +26,7 @@
 summary:     1
 
 diff -r 000000000000 -r 8ba83d44753d foo
---- /dev/null	Thu Jan  1 00:00:00 1970 +0000
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 +++ b/foo	Mon Jan 12 13:46:40 1970 +0000
 @@ -0,0 +1,1 @@
 +a
@@ -40,7 +40,7 @@
 
 diff -r 8ba83d44753d -r a1fce69c50d9 foo
 --- a/foo	Mon Jan 12 13:46:40 1970 +0000
-+++ /dev/null	Thu Jan  1 00:00:00 1970 +0000
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,1 +0,0 @@
 -a