##// END OF EJS Templates
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.

File last commit:

r11680:7fefef3c default
r12156:4c94b6d0 default
Show More
test-convert-filemap.out
167 lines | 5.0 KiB | text/plain | TextLexer
/ tests / test-convert-filemap.out
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
created new head
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 @ 8 "8: change foo" files: foo
|
o 7 "7: second merge; change bar" files: bar baz
|\
| o 6 "6: change foo baz" files: baz foo
| |
o | 5 "5: change bar baz quux" files: bar baz quux
|/
o 4 "4: first merge; change bar baz" files: bar baz
|\
| o 3 "3: change bar quux" files: bar quux
| |
o | 2 "2: change foo" files: foo
|/
o 1 "1: add bar quux; copy foo to copied" files: bar copied quux
|
Patrick Mezard
test-convert-filemap: test improved filtering algorithm
r9885 o 0 "0: add foo baz dir/" files: baz dir/file dir/file2 dir/subdir/file3 dir/subdir/file4 foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379
% final file versions in this repo:
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir/file
75e6d3f8328f5f6ace6bf10b98df793416a09dca 644 dir/file2
Patrick Mezard
test-convert-filemap: test improved filtering algorithm
r9885 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir/subdir/file3
57a1c1511590f3de52874adfa04effe8a77d64af 644 dir/subdir/file4
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
% foo: skip unwanted merges; use 1st parent in 1st merge, 2nd in 2nd
Matt Mackall
context: consistently return p1 context for None
r6737 @ 3 "8: change foo" files: foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 2 "6: change foo baz" files: foo
|
o 1 "2: change foo" files: foo
|
o 0 "0: add foo baz dir/" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % bar: merges are not merges anymore
Matt Mackall
context: consistently return p1 context for None
r6737 @ 4 "7: second merge; change bar" files: bar
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 3 "5: change bar baz quux" files: bar
|
o 2 "4: first merge; change bar baz" files: bar
|
o 1 "3: change bar quux" files: bar
|
o 0 "1: add bar quux; copy foo to copied" files: bar
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % baz: 1st merge is not a merge anymore; 2nd still is
Matt Mackall
context: consistently return p1 context for None
r6737 @ 4 "7: second merge; change bar" files: baz
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |\
| o 3 "6: change foo baz" files: baz
| |
o | 2 "5: change bar baz quux" files: baz
|/
o 1 "4: first merge; change bar baz" files: baz
|
o 0 "0: add foo baz dir/" files: baz
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 94c1be4dfde2ee8d78db8bbfcf81210813307c3d 644 baz
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % foo quux: we add additional merges when they are interesting
Matt Mackall
context: consistently return p1 context for None
r6737 @ 8 "8: change foo" files: foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 7 "7: second merge; change bar" files:
|\
| o 6 "6: change foo baz" files: foo
| |
o | 5 "5: change bar baz quux" files: quux
|/
o 4 "4: first merge; change bar baz" files:
|\
| o 3 "3: change bar quux" files: quux
| |
o | 2 "2: change foo" files: foo
|/
o 1 "1: add bar quux; copy foo to copied" files: quux
|
o 0 "0: add foo baz dir/" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % bar quux: partial conversion
Matt Mackall
context: consistently return p1 context for None
r6737 @ 1 "3: change bar quux" files: bar quux
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 0 "1: add bar quux; copy foo to copied" files: bar quux
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 b79105bedc55102f394e90a789c9c380117c1b4a 644 bar
db0421cc6b685a458c8d86c7d5c004f94429ea23 644 quux
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % bar quux: complete the partial conversion
Matt Mackall
context: consistently return p1 context for None
r6737 @ 4 "7: second merge; change bar" files: bar
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 3 "5: change bar baz quux" files: bar quux
|
o 2 "4: first merge; change bar baz" files: bar
|
o 1 "3: change bar quux" files: bar quux
|
o 0 "1: add bar quux; copy foo to copied" files: bar quux
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9463f52fe115e377cf2878d4fc548117211063f2 644 bar
bc3eca3f47023a3e70ca0d8cc95a22a6827db19d 644 quux
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % foo: partial conversion
Matt Mackall
context: consistently return p1 context for None
r6737 @ 0 "0: add foo baz dir/" files: foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % foo: complete the partial conversion
Matt Mackall
context: consistently return p1 context for None
r6737 @ 3 "8: change foo" files: foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 2 "6: change foo baz" files: foo
|
o 1 "2: change foo" files: foo
|
o 0 "0: add foo baz dir/" files: foo
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 % copied: copied file; source not included in new repo
Matt Mackall
context: consistently return p1 context for None
r6737 @ 0 "1: add bar quux; copy foo to copied" files: copied
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 copied
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 copied not renamed
% foo copied: copied file; source included in new repo
Matt Mackall
context: consistently return p1 context for None
r6737 @ 4 "8: change foo" files: foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 3 "6: change foo baz" files: foo
|
o 2 "2: change foo" files: foo
|
o 1 "1: add bar quux; copy foo to copied" files: copied
|
o 0 "0: add foo baz dir/" files: foo
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 7711d36246cc83e61fb29cd6d4ef394c63f1ceaf 644 copied
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 copied renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd
Matt Mackall
context: consistently return p1 context for None
r6737 @ 4 "8: change foo" files: foo2
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 |
o 3 "6: change foo baz" files: foo2
|
o 2 "2: change foo" files: foo2
|
o 1 "1: add bar quux; copy foo to copied" files: copied2
|
Patrick Mezard
test-convert-filemap: test improved filtering algorithm
r9885 o 0 "0: add foo baz dir/" files: dir2/file dir2/subdir/file3 foo2
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
r10490 d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 3e20847584beff41d7cd16136b7331ab3d754be0 644 dir2/file
Patrick Mezard
test-convert-filemap: test improved filtering algorithm
r9885 5fe139720576e18e34bcc9f79174db8897c8afe9 644 dir2/subdir/file3
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 9a7b52012991e4873687192c3e17e61ba3e837a3 644 foo2
Alexis S. L. Carvalho
mercurial_source: add --filemap support
r5379 copied2 renamed from foo2:2ed2a3912a0b24502043eae84ee4b279c18b90dd
copied:
foo
copied2:
foo
Mads Kiilerich
convert: warn on superfluous / in paths...
r11680 % filemap errors
errors.fmap:1: superfluous / in exclude 'dir/'
errors.fmap:3: superfluous / in include '/dir'
errors.fmap:3: superfluous / in rename '/dir'
errors.fmap:3: superfluous / in exclude 'dir//dir'
errors.fmap:4: unknown directive 'out of sync'
errors.fmap:5: path to exclude is missing
abort: errors in filemap