##// 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:

r12156:4c94b6d0 default
r12156:4c94b6d0 default
Show More
test-filebranch.out
69 lines | 2.9 KiB | text/plain | TextLexer
/ tests / test-filebranch.out
mpm@selenic.com
Fix long-standing excessive file merges...
r990 creating base
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
Fix long-standing excessive file merges...
r990 creating branch a
creating branch b
we shouldn't have anything but n state here
merging
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
mpm@selenic.com
Update tests
r1043 added 1 changesets with 2 changes to 2 files (+1 heads)
Vadim Gelfer
add merge command. means same thing as "update -m"....
r2019 (run 'hg heads' to see heads, 'hg merge' to merge)
mpm@selenic.com
Fix long-standing excessive file merges...
r990 merging for foo
resolving manifests
getting bar
merging foo
Benoit Boissinot
ui: output the number of file updated/merged/removed/... on update...
r1922 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
mpm@selenic.com
Fix long-standing excessive file merges...
r990 we shouldn't have anything but foo in merge state here
m 644 3 foo
main: we should have a merge here
rev offset length base linkrev nodeid p1 p2
Martin Geisler
tests: remove unneeded -d flags...
r12156 0 0 73 0 0 cdca01651b96 000000000000 000000000000
1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000
2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000
3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16
mpm@selenic.com
Clean up some merge logic...
r993 log should show foo and quux changed
Martin Geisler
tests: remove unneeded -d flags...
r12156 changeset: 3:d8a521142a3c
mpm@selenic.com
Clean up some merge logic...
r993 tag: tip
Martin Geisler
tests: remove unneeded -d flags...
r12156 parent: 1:f6718a9cb7f3
parent: 2:bdd988058d16
mpm@selenic.com
Clean up some merge logic...
r993 user: test
Martin Geisler
tests: remove unneeded -d flags...
r12156 date: Thu Jan 01 00:00:00 1970 +0000
mpm@selenic.com
Clean up some merge logic...
r993 files: foo quux
description:
merge
mpm@selenic.com
Fix long-standing excessive file merges...
r990 foo: we should have a merge here
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 b8e02f643373 000000000000 000000000000
1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000
3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
bar: we shouldn't have a merge here
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 b8e02f643373 000000000000 000000000000
1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000
baz: we shouldn't have a merge here
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 b8e02f643373 000000000000 000000000000
1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
quux: we shouldn't have a merge here
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 b8e02f643373 000000000000 000000000000
1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000
mpm@selenic.com
Clean up some merge logic...
r993 manifest entries should match tips of all files
Patrick Mezard
Display symlink or executable bit with manifest -v...
r5405 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar
2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz
aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo
6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux
mpm@selenic.com
Fix long-standing excessive file merges...
r990 everything should be clean now
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 4 changesets, 10 total revisions