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

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

config: raise ConfigError on non-existing include files...
config: raise ConfigError on non-existing include files Before, an %include directive for a non-existing file resulted in an IOError and a traceback.
Stefano Tortarolo - - Load All Authors

File last commit:

r7952:b214066b default
r10042:7cdd2a7d stable
Show More
test-rebase-check-restore.out
76 lines | 939 B | text/plain | TextLexer
/ tests / test-rebase-check-restore.out
History | Annotation | Raw |Copy content |Copy permalink
% - Rebasing B onto E - check keep
@ 5:F:notdefault
|
| o 4:E:
| |
| o 3:D:
|/
| o 2:C:
| |
| o 1:B:
|/
o 0:A:
merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% - Solve the conflict and go on
rebase completed
@ 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:
merging A
warning: conflicts during merge.
merging A failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
% - Solve the conflict and go on
saving bundle to
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rebase completed
@ 5:F:notdefault
|
o 4:E:
|
o 3:D:
|
| o 2:C:
| |
| o 1:B:
|/
o 0:A: