##// 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.
timeless - - Load All Authors

File last commit:

r11716:db426935 stable
r12156:4c94b6d0 default
Show More
test-merge-types.out
29 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-merge-types.out
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
update test-merge-types
 r5710 adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 searching for copies back to rev 1
Matt Mackall
update test-merge-types
 r5710 resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 a: update permissions -> e
timeless
progress: use gerund (updating) for merge progress
 r11716 updating: a 1/1 files (100.00%)
Matt Mackall
update test-merge-types
 r5710 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 searching for copies back to rev 1
Matt Mackall
update test-merge-types
 r5710 resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 a: remote is newer -> g
timeless
progress: use gerund (updating) for merge progress
 r11716 updating: a 1/1 files (100.00%)
Matt Mackall
update test-merge-types
 r5710 getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)