Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dee55c4a4963
children 2ff37e3bf780
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
4 mkdir r1 4 mkdir r1
5 cd r1 5 cd r1
6 hg init 6 hg init
7 echo a > a 7 echo a > a
8 hg addremove 8 hg addremove
9 hg commit -m "1" -d "0 0" 9 hg commit -m "1" -d "1000000 0"
10 10
11 hg clone . ../r2 11 hg clone . ../r2
12 cd ../r2 12 cd ../r2
13 hg up 13 hg up
14 echo abc > a 14 echo abc > a
17 17
18 cd ../r1 18 cd ../r1
19 echo b > b 19 echo b > b
20 echo a2 > a 20 echo a2 > a
21 hg addremove 21 hg addremove
22 hg commit -m "2" -d "0 0" 22 hg commit -m "2" -d "1000000 0"
23 23
24 cd ../r2 24 cd ../r2
25 hg -q pull ../r1 25 hg -q pull ../r1
26 hg status 26 hg status
27 hg parents 27 hg parents
41 cd ../r1 41 cd ../r1
42 hg up 0 42 hg up 0
43 echo b2 > b 43 echo b2 > b
44 echo a3 > a 44 echo a3 > a
45 hg addremove 45 hg addremove
46 hg commit -m "3" -d "0 0" 46 hg commit -m "3" -d "1000000 0"
47 47
48 cd ../r2 48 cd ../r2
49 hg -q pull ../r1 49 hg -q pull ../r1
50 hg status 50 hg status
51 hg parents 51 hg parents