Mercurial > hg > gitweb
annotate tests/testmergerevert.out @ 1933:7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
author  Thomas Arendsen Hein <thomas@intevation.de> 

date  Mon, 13 Mar 2006 13:05:41 +0100 
parents  5a034646e472 
children  d436b21b20dc 
rev  line source 

1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

1 1:016807e6fdaf 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

2 0:eb43f19ff115 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

3 016807e6fdaf tip 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

4 eb43f19ff115 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

5 eb43f19ff115+ 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

6 eb43f19ff115 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

7 016807e6fdaf tip 
792
49ec802b4a16
Added tests for bug with threewaymerging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset

8 merging file1 
1933
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

9 016807e6fdaf tip 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

10 016807e6fdaf tip 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

11 016807e6fdaf tip 
7544700fd931
Use 'hg ci d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset

12 016807e6fdaf tip 