mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
cc612c476f
Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
51 lines
1007 B
Bash
Executable File
51 lines
1007 B
Bash
Executable File
#!/bin/sh
|
|
|
|
hg init
|
|
|
|
echo "# revision 0"
|
|
echo "unchanged" > unchanged
|
|
echo "remove me" > remove
|
|
echo "copy me" > copy
|
|
echo "move me" > move
|
|
for i in 1 2 3 4 5 6 7 8 9; do
|
|
echo "merge ok $i" >> zzz1_merge_ok
|
|
done
|
|
echo "merge bad" > zzz2_merge_bad
|
|
hg ci -Am "revision 0"
|
|
|
|
echo "# revision 1"
|
|
hg rm remove
|
|
hg mv move moved
|
|
hg cp copy copied
|
|
echo "added" > added
|
|
hg add added
|
|
echo "new first line" > zzz1_merge_ok
|
|
hg cat zzz1_merge_ok >> zzz1_merge_ok
|
|
echo "new last line" >> zzz2_merge_bad
|
|
hg ci -m "revision 1"
|
|
|
|
echo "# local changes to revision 0"
|
|
hg co 0
|
|
echo "new last line" >> zzz1_merge_ok
|
|
echo "another last line" >> zzz2_merge_bad
|
|
hg diff --nodates | grep "^[+-][^<>]"
|
|
hg st
|
|
|
|
echo "# local merge with bad merge tool"
|
|
HGMERGE=false hg co
|
|
hg co 0
|
|
hg diff --nodates | grep "^[+-][^<>]"
|
|
hg st
|
|
|
|
echo "# local merge with conflicts"
|
|
hg co
|
|
hg co 0
|
|
hg diff --nodates | grep "^[+-][^<>]"
|
|
hg st
|
|
|
|
echo "# local merge without conflicts"
|
|
hg revert zzz2_merge_bad
|
|
hg co
|
|
hg diff --nodates | grep "^[+-][^<>]"
|
|
hg st
|