view tests/test-rebase-check-restore.out @ 9469:7f0f882af23d

config: abort on indented non-continuation lines (issue1829)

Previously, as soon as a continuation would be met, "cont" would stay
forever set to True, but "item" was set back to "None".
This caused the continuation code bits to run every time, until the next
"self.get(section, item) + '\n'" which would crash.

% - 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: