summaryrefslogtreecommitdiff
path: root/xdelta3/xdelta3-merge.h
AgeCommit message (Collapse)Author
2008-04-19Straighten up the logic for calling xd3_merge_inputs in both josh.macdonald
main_merge_arguments and main_merge_output.
2008-04-15Fixes for issue 70. The test inputs tickled a case where thejosh.macdonald
non-blocking API would not make progress, searching for match on the page boundary and repeatedly asking the application to get another source block. This is only a non-blocking issue, glad it's fixed. I'll add encode_decode_test to my test suite before another release.
2008-04-09Add mechanism for processing merge arguments in order, memoryjosh.macdonald
management for xd3_whole_target structures being passed between arguments-processing and main merge_output function.
2008-04-02Merge command passes its first smoke test, reproduces a delta byjosh.macdonald
instruction-level rewriting of the input to the output. Hits an assertion due to target-copies that cross window boundaries--next step is to fix the output window size to the last input window size. This fixes an important bug in xd3_choose_instruction, which assumed that copy instructions were at least four bytes, but this is no longer the case for merged outputs (at least for the case where window size changes, which will not be allowed in future).
2007-12-27Adding more support for "merge" command.josh.macdonald