Mercurial > hg
view tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.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 | 3e7611a83230 |
children |
line wrap: on
line source
% create cvs repository U cvsworktmp/CVSROOT/checkoutlist U cvsworktmp/CVSROOT/commitinfo U cvsworktmp/CVSROOT/config U cvsworktmp/CVSROOT/cvswrappers U cvsworktmp/CVSROOT/loginfo U cvsworktmp/CVSROOT/modules U cvsworktmp/CVSROOT/notify U cvsworktmp/CVSROOT/postadmin U cvsworktmp/CVSROOT/postproxy U cvsworktmp/CVSROOT/posttag U cvsworktmp/CVSROOT/postwatch U cvsworktmp/CVSROOT/preproxy U cvsworktmp/CVSROOT/rcsinfo U cvsworktmp/CVSROOT/taginfo U cvsworktmp/CVSROOT/verifymsg cvs add: use `cvs commit' to add this file permanently checking in initial revision: 1.1 U cvswork/foo.txt checking in new revision: 1.1.2.1; previous revision: 1.1 checking in new revision: 1.1.2.2; previous revision: 1.1.2.1 checking in new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2 U foo.txt checking in new revision: 1.1.4.1; previous revision: 1.1 rcsmerge: warning: conflicts during merge merging MYBRANCH1 retrieving revision 1.1 retrieving revision 1.1.2.2 Merging differences between 1.1 and 1.1.2.2 into foo.txt checking in new revision: 1.1.4.2; previous revision: 1.1.4.1 U foo.txt merging MYBRANCH1_2 retrieving revision 1.1 retrieving revision 1.1.2.2.2.1 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt checking in new revision: 1.2; previous revision: 1.1 collecting CVS rlog 7 log entries creating changesets 7 changeset entries --------------------- PatchSet 1 Date: Author: Branch: HEAD Tag: (none) Log: foo.txt Members: foo.txt:INITIAL->1.1 --------------------- PatchSet 2 Date: Author: Branch: MYBRANCH1 Tag: (none) Parent: 1 Log: bar Members: foo.txt:1.1->1.1.2.1 --------------------- PatchSet 3 Date: Author: Branch: MYBRANCH1 Tag: (none) Parent: 2 Log: baz Members: foo.txt:1.1.2.1->1.1.2.2 --------------------- PatchSet 4 Date: Author: Branch: MYBRANCH1_1 Tag: (none) Parent: 1 Log: quux Members: foo.txt:1.1->1.1.4.1 --------------------- PatchSet 5 Date: Author: Branch: MYBRANCH1_2 Tag: (none) Parent: 3 Log: bazzie Members: foo.txt:1.1.2.2->1.1.2.2.2.1 --------------------- PatchSet 6 Date: Author: Branch: HEAD Tag: (none) Parents: 1,5 Log: merge Members: foo.txt:1.1->1.2 --------------------- PatchSet 7 Date: Author: Branch: MYBRANCH1_1 Tag: (none) Parents: 4,3 Log: merge Members: foo.txt:1.1.4.1->1.1.4.2