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

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

tests: remove unneeded -d flags...
tests: remove unneeded -d flags 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.
Mads Kiilerich - - Load All Authors

File last commit:

r10265:0d8577e1 stable
r12156:4c94b6d0 default
Show More
test-patch-offset
67 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-patch-offset
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
cat > writepatterns.py <<EOF
import sys
path = sys.argv[1]
patterns = sys.argv[2:]
fp = file(path, 'wb')
for pattern in patterns:
count = int(pattern[0:-1])
char = pattern[-1] + '\n'
fp.write(char*count)
fp.close()
EOF
echo % prepare repo
hg init a
cd a
# These initial lines of Xs were not in the original file used to generate
# the patch. So all the patch hunks need to be applied to a constant offset
# within this file. If the offset isn't tracked then the hunks can be
# applied to the wrong lines of this file.
python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
hg commit -Am adda
# This is a cleaner patch generated via diff
# In this case it reproduces the problem when
# the output of hg export does not
echo % import patch
hg import -v -m 'b' -d '2 0' - <<EOF
--- a/a 2009-12-08 19:26:17.000000000 -0800
+++ b/a 2009-12-08 19:26:17.000000000 -0800
@@ -9,7 +9,7 @@
A
A
B
-A
+a
A
A
A
@@ -53,7 +53,7 @@
A
A
B
-A
+a
A
A
A
@@ -75,7 +75,7 @@
A
A
B
-A
+a
A
A
A
EOF
echo % compare imported changes against reference file
python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
diff aref a