view tests/test-rebase-keep-branch.out @ 8810:ac92775b3b80

Add patch.eol to ignore EOLs when patching (issue1019)

The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.

0 files updated, 0 files merged, 2 files removed, 0 files unresolved
marked working directory as branch notdefault
created new head
@  4:r1:notdefault
|
| o  3:l2:
| |
| o  2:l1:
|/
o  1:c2:
|
o  0:c1:


% Rebase a branch while preserving the branch name
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
rebase completed
@  4:r1:notdefault
|
o  3:l2:
|
o  2:l1:
|
o  1:c2:
|
o  0:c1:

% dirstate branch should be "notdefault"
notdefault