##// END OF EJS Templates
merge with crew
Benoit Boissinot -
r1958:f92cf4a8 merge default
parent child Browse files
Show More
@@ -742,7 +742,7 b' def makedate():'
742 tz = time.timezone
742 tz = time.timezone
743 return time.mktime(lt), tz
743 return time.mktime(lt), tz
744
744
745 def datestr(date=None, format='%c'):
745 def datestr(date=None, format='%a %b %d %H:%M:%S %Y'):
746 """represent a (unixtime, offset) tuple as a localized time.
746 """represent a (unixtime, offset) tuple as a localized time.
747 unixtime is seconds since the epoch, and offset is the time zone's
747 unixtime is seconds since the epoch, and offset is the time zone's
748 number of seconds away from UTC."""
748 number of seconds away from UTC."""
@@ -8,10 +8,10 b' hg commit -m 1 -d "1000000 0"'
8 rm foo
8 rm foo
9 hg remove foo
9 hg remove foo
10 hg commit -m 2 -d "1000000 0"
10 hg commit -m 2 -d "1000000 0"
11 hg export 0 | sed -e "s/Thu Jan 01/Thu Jan 1/"
11 hg export 0
12 hg export 1 | sed -e "s/Thu Jan 01/Thu Jan 1/"
12 hg export 1
13 hg log -p -r 0 | sed -e "s/Thu Jan 01/Thu Jan 1/"
13 hg log -p -r 0
14 hg log -p -r 1 | sed -e "s/Thu Jan 01/Thu Jan 1/"
14 hg log -p -r 1
15
15
16 cd ..
16 cd ..
17 hg clone a b
17 hg clone a b
@@ -5,7 +5,7 b''
5 1
5 1
6
6
7 diff -r 000000000000 -r 8ba83d44753d foo
7 diff -r 000000000000 -r 8ba83d44753d foo
8 --- /dev/null Thu Jan 1 00:00:00 1970 +0000
8 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9 +++ b/foo Mon Jan 12 13:46:40 1970 +0000
9 +++ b/foo Mon Jan 12 13:46:40 1970 +0000
10 @@ -0,0 +1,1 @@
10 @@ -0,0 +1,1 @@
11 +a
11 +a
@@ -17,7 +17,7 b' 2'
17
17
18 diff -r 8ba83d44753d -r a1fce69c50d9 foo
18 diff -r 8ba83d44753d -r a1fce69c50d9 foo
19 --- a/foo Mon Jan 12 13:46:40 1970 +0000
19 --- a/foo Mon Jan 12 13:46:40 1970 +0000
20 +++ /dev/null Thu Jan 1 00:00:00 1970 +0000
20 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
21 @@ -1,1 +0,0 @@
21 @@ -1,1 +0,0 @@
22 -a
22 -a
23 changeset: 0:8ba83d44753d
23 changeset: 0:8ba83d44753d
@@ -26,7 +26,7 b' date: Mon Jan 12 13:46:40 1970 +0'
26 summary: 1
26 summary: 1
27
27
28 diff -r 000000000000 -r 8ba83d44753d foo
28 diff -r 000000000000 -r 8ba83d44753d foo
29 --- /dev/null Thu Jan 1 00:00:00 1970 +0000
29 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
30 +++ b/foo Mon Jan 12 13:46:40 1970 +0000
30 +++ b/foo Mon Jan 12 13:46:40 1970 +0000
31 @@ -0,0 +1,1 @@
31 @@ -0,0 +1,1 @@
32 +a
32 +a
@@ -40,7 +40,7 b' summary: 2'
40
40
41 diff -r 8ba83d44753d -r a1fce69c50d9 foo
41 diff -r 8ba83d44753d -r a1fce69c50d9 foo
42 --- a/foo Mon Jan 12 13:46:40 1970 +0000
42 --- a/foo Mon Jan 12 13:46:40 1970 +0000
43 +++ /dev/null Thu Jan 1 00:00:00 1970 +0000
43 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
44 @@ -1,1 +0,0 @@
44 @@ -1,1 +0,0 @@
45 -a
45 -a
46
46
General Comments 0
You need to be logged in to leave comments. Login now