Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-filebranch @ 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 | 6f274afc05c7 |
children | e506c14382fd |
comparison
equal
deleted
inserted
replaced
1932:82995896d5af | 1933:7544700fd931 |
---|---|
15 echo 1 > foo | 15 echo 1 > foo |
16 echo 1 > bar | 16 echo 1 > bar |
17 echo 1 > baz | 17 echo 1 > baz |
18 echo 1 > quux | 18 echo 1 > quux |
19 hg add foo bar baz quux | 19 hg add foo bar baz quux |
20 hg commit -m "base" -d "0 0" | 20 hg commit -m "base" -d "1000000 0" |
21 | 21 |
22 cd .. | 22 cd .. |
23 hg clone a b | 23 hg clone a b |
24 | 24 |
25 echo creating branch a | 25 echo creating branch a |
26 cd a | 26 cd a |
27 echo 2a > foo | 27 echo 2a > foo |
28 echo 2a > bar | 28 echo 2a > bar |
29 hg commit -m "branch a" -d "0 0" | 29 hg commit -m "branch a" -d "1000000 0" |
30 | 30 |
31 echo creating branch b | 31 echo creating branch b |
32 | 32 |
33 cd .. | 33 cd .. |
34 cd b | 34 cd b |
35 echo 2b > foo | 35 echo 2b > foo |
36 echo 2b > baz | 36 echo 2b > baz |
37 hg commit -m "branch b" -d "0 0" | 37 hg commit -m "branch b" -d "1000000 0" |
38 | 38 |
39 echo "we shouldn't have anything but n state here" | 39 echo "we shouldn't have anything but n state here" |
40 hg debugstate | cut -b 1-16,35- | 40 hg debugstate | cut -b 1-16,35- |
41 | 41 |
42 echo merging | 42 echo merging |
48 echo new > quux | 48 echo new > quux |
49 | 49 |
50 echo "we shouldn't have anything but foo in merge state here" | 50 echo "we shouldn't have anything but foo in merge state here" |
51 hg debugstate | cut -b 1-16,35- | grep "^m" | 51 hg debugstate | cut -b 1-16,35- | grep "^m" |
52 | 52 |
53 hg ci -m "merge" -d "0 0" | 53 hg ci -m "merge" -d "1000000 0" |
54 | 54 |
55 echo "main: we should have a merge here" | 55 echo "main: we should have a merge here" |
56 hg debugindex .hg/00changelog.i | 56 hg debugindex .hg/00changelog.i |
57 | 57 |
58 echo "log should show foo and quux changed" | 58 echo "log should show foo and quux changed" |