Mercurial > hg
view tests/test-bheads.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.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 15 Jun 2009 00:03:26 +0200 |
| parents | 4b0c9c674707 |
| children | c295a82a020b |
line wrap: on
line source
0: Adding root node ------- 0: Adding root node ======= marked working directory as branch a 1: Adding a branch ------- 1: Adding a branch ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b created new head 2: Adding b branch 1: Adding a branch ------- 2: Adding b branch ======= 3: Adding b branch head 1 1: Adding a branch ------- 3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 4: Adding b branch head 2 3: Adding b branch head 1 1: Adding a branch ------- 4: Adding b branch head 2 3: Adding b branch head 1 ======= 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 5: Adding b branch head 3 4: Adding b branch head 2 3: Adding b branch head 1 1: Adding a branch ------- 5: Adding b branch head 3 4: Adding b branch head 2 3: Adding b branch head 1 ======= 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ======= marked working directory as branch c 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 7: Adding c branch ======= no changes on branch c containing . are reachable from 3 1 ------- 7: Adding c branch 0 ------- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 ------- 3: Adding b branch head 1 0 ------- 3: Adding b branch head 1 6: Merging b branch head 2 and b branch head 3 0 ------- no changes on branch b containing . are reachable from 7 1 ======= 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 0: Adding root node ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 1: Adding a branch ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 7: Adding c branch 3: Adding b branch head 1 1: Adding a branch ------- 7: Adding c branch ------- ======= 1: Adding a branch ------- 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 ------- 7: Adding c branch ------- abort: unknown revision 'z'! ------- ======= 0: Adding root node 1: Adding a branch 6: Merging b branch head 2 and b branch head 3 3: Adding b branch head 1 7: Adding c branch