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

r11203:7a9cf012 default
r12156:4c94b6d0 default
Show More
test-rebase-scenario-global.out
108 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-rebase-scenario-global.out
Stefano Tortarolo
Add rebase extension
r6906 @ 5: F
|
| o 4: E
|/|
o | 3: D
| |
| o 2: C
|/
| o 1: B
|/
o 0: A
% Rebasing
% B onto F - simple rebase
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 5: B
|
o 4: F
|
| o 3: E
|/|
o | 2: D
| |
| o 1: C
|/
o 0: A
% B onto D - intermediate point
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 5: B
|
| o 4: F
|/
| o 3: E
|/|
o | 2: D
| |
| o 1: C
|/
o 0: A
% C onto F - skip of E
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 4: C
|
o 3: F
|
o 2: D
|
| o 1: B
|/
o 0: A
% D onto C - rebase of a branching point (skip E)
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 4: F
|
o 3: D
|
o 2: C
|
| o 1: B
|/
o 0: A
% E onto F - merged revision having a parent in ancestors of target
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 5: E
|\
| o 4: F
| |
| o 3: D
| |
o | 2: C
|/
| o 1: B
|/
o 0: A
% D onto B - E maintains C as parent
Matt Mackall
Fix up rebase's handling of strip backups
r11201 saved backup bundle to
Stefano Tortarolo
Add rebase extension
r6906 @ 5: F
|
| o 4: E
|/|
o | 3: D
| |
| o 2: C
| |
o | 1: B
|/
o 0: A
Sune Foldager
rebase: return early when source is descendant of destination...
r9578 % These will fail (using --source)
Stefano Tortarolo
Add rebase extension
r6906 % E onto D - rebase onto an ancestor
Sune Foldager
rebase: improve error and debug messages
r9577 abort: source is descendant of destination
Stefano Tortarolo
Add rebase extension
r6906 % D onto E - rebase onto a descendant
Sune Foldager
rebase: improve error and debug messages
r9577 abort: source is ancestor of destination
Stefano Tortarolo
Add rebase extension
r6906 % E onto B - merge revision with both parents not in ancestors of target
abort: cannot use revision 4 as base, result would have 3 parents
Sune Foldager
rebase: return early when source is descendant of destination...
r9578
% These will abort gracefully (using --base)
% E onto E - rebase onto same changeset
nothing to rebase
% E onto D - rebase onto an ancestor
nothing to rebase
% D onto E - rebase onto a descendant
nothing to rebase