##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

color: add win32 support for non-black background...
color: add win32 support for non-black background This complicates the code a bit, since attributes need to be masked together correctly before they are applied. Perhaps the code should be redesigned at some point, but this works well for now.
Matt Mackall - - Load All Authors

File last commit:

r11203:7a9cf012 default
r12277:a7d3147b stable
Show More
test-rebase-check-restore.out
69 lines | 797 B | text/plain | TextLexer
/ tests / test-rebase-check-restore.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
rebase: store/restore arguments correctly...
 r7952
% - Rebasing B onto E - check keep
@ 5:F:notdefault
|
| o 4:E:
| |
| o 3:D:
|/
| o 2:C:
| |
| o 1:B:
|/
o 0:A:
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
Matt Mackall
rebase: use helpers.sh in tests
 r11198 merging A
Stefano Tortarolo
rebase: store/restore arguments correctly...
 r7952
% - Solve the conflict and go on
@ 7:C:
|
o 6:B:
|
| o 5:F:notdefault
| |
o | 4:E:
| |
o | 3:D:
|/
| o 2:C:
| |
| o 1:B:
|/
o 0:A:
% - Rebase F onto E - check keepbranches
@ 5:F:notdefault
|
| o 4:E:
| |
| o 3:D:
|/
| o 2:C:
| |
| o 1:B:
|/
o 0:A:
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
Matt Mackall
rebase: use helpers.sh in tests
 r11198 merging A
Stefano Tortarolo
rebase: store/restore arguments correctly...
 r7952
% - Solve the conflict and go on
Matt Mackall
Fix up rebase's handling of strip backups
 r11201 saved backup bundle to
Stefano Tortarolo
rebase: store/restore arguments correctly...
 r7952 @ 5:F:notdefault
|
o 4:E:
|
o 3:D:
|
| o 2:C:
| |
| o 1:B:
|/
o 0:A: