##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
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.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default
r1933:7544700f default
Show More
test-merge4
17 lines | 339 B | text/plain | TextLexer
/ tests / test-merge4
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg update -m 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"