Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge5 @ 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 0902ffece4b4
children 39eb64b23cb5
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
4 cd t 4 cd t
5 hg init 5 hg init
6 echo This is file a1 > a 6 echo This is file a1 > a
7 echo This is file b1 > b 7 echo This is file b1 > b
8 hg add a b 8 hg add a b
9 hg commit -m "commit #0" -d "0 0" 9 hg commit -m "commit #0" -d "1000000 0"
10 echo This is file b22 > b 10 echo This is file b22 > b
11 hg commit -m"comment #1" -d "0 0" 11 hg commit -m"comment #1" -d "1000000 0"
12 hg update 0 12 hg update 0
13 rm b 13 rm b
14 hg commit -A -m"comment #2" -d "0 0" 14 hg commit -A -m"comment #2" -d "1000000 0"
15 # in theory, we shouldn't need the "yes k" below, but it prevents 15 # in theory, we shouldn't need the "yes k" below, but it prevents
16 # this test from hanging when "hg update" erroneously prompts the 16 # this test from hanging when "hg update" erroneously prompts the
17 # user for "keep or delete" 17 # user for "keep or delete"
18 yes k | hg update 1 18 yes k | hg update 1
19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing 19 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing