##// 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-confused-revert
52 lines | 690 B | text/plain | TextLexer
/ tests / test-confused-revert
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449 #!/bin/sh
hg init
echo foo > a
hg add a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "1" -d "1000000 0"
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449
echo bar > b
hg add b
hg remove a
echo "%%% should show a removed and b added"
hg status
echo "reverting..."
hg revert
echo "%%% should show b unknown and a back to normal"
hg status
rm b
hg co -C 0
echo foo-a > a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "2a" -d "1000000 0"
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449
hg co -C 0
echo foo-b > a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 hg commit -m "2b" -d "1000000 0"
Matt Mackall
Add test-confused-revert, fix permissions on test-revert
 r1449
HGMERGE=true hg update -m 1
echo "%%% should show foo-b"
cat a
echo bar > b
hg add b
rm a
hg remove a
echo "%%% should show a removed and b added"
hg status
echo "reverting..."
hg revert
echo "%%% should show b unknown and a marked modified (merged)"
hg status
echo "%%% should show foo-b"
cat a