projects / platform / upstream / perl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 11cf72d) | patch
Implement 'replace' option when merging typemaps
authorSteffen Mueller <smueller@cpan.org>
Fri, 11 Feb 2011 16:20:17 +0000 (17:20 +0100)
committerSteffen Mueller <smueller@cpan.org>
Tue, 12 Jul 2011 18:54:48 +0000 (20:54 +0200)
commit8226b442f3c07b0fedbfbf550f750c112e4392a8
treeb49bb0c4994a10de34ea98439dcb23f5e656b181tree | snapshot
parent11cf72d420e6552ec98eaec742380315e406368ccommit | diff
Implement 'replace' option when merging typemaps

And by proxy, this had to be implemented in the three add_* methods.
Also adds more tests for merging with conflicts.
MANIFEST diff | blob | history
dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm diff | blob | history
dist/ExtUtils-ParseXS/lib/ExtUtils/Typemaps.pm diff | blob | history
dist/ExtUtils-ParseXS/t/513-t-merge.t diff | blob | history
dist/ExtUtils-ParseXS/t/data/confl_repl.typemap [new file with mode: 0644] blob
dist/ExtUtils-ParseXS/t/data/conflicting.typemap [new file with mode: 0644] blob
Domain: System / Base;