search

hakandilek / xmdl

Automatically exported from code.google.com/p/xmdl
0 stars 0 forks source link

Diff/patch for non-java generated source files #45

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago 
Upon code generation, before target file is written, it should be compared
with the destination file (if one exists) that might be previously
generated to build a patch file (diff).

This patch file might be used to automatically deliver a merge if there are
no conflicts. If conflicts occur on patch, user managed merge can be
performed. Or simply the patch file may be written to disk for manual merging.

This library might be useful for char-by-char merge:
http://code.google.com/p/google-diff-match-patch/

Original issue reported on code.google.com by hakandi...@gmail.com on 28 Oct 2007 at 4:54