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

File last commit:

r11203:7a9cf012 default
r12156:4c94b6d0 default
Show More
test-rebase-conflicts.out
60 lines | 731 B | text/plain | TextLexer
/ tests / test-rebase-conflicts.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@ 5: L3
|
o 4: L2
|
o 3: L1
|
| o 2: C3
|/
o 1: C2
|
o 0: C1
% Try to call --continue
abort: no rebase in progress
% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% Try to continue without solving the conflict
abort: unresolved merge conflicts (see hg resolve)
% Conclude rebase
saved backup bundle to
@ 5: L3
|
o 4: L2
|
o 3: L1
|
o 2: C3
|
o 1: C2
|
o 0: C1
% Check correctness
- Rev. 0
c1
- Rev. 1
c1
c2
- Rev. 2
c1
c2
c3
- Rev. 3
c1
c2
c3
- Rev. 4
resolved merge
- Rev. 5
resolved merge