On Wed, Apr 11, 2012 at 2:38 AM, Ruth Ivimey-Cook <r...@ivimey.org> wrote: [...] > Is there a way (hook?), when TSVN sees a file is different, for it to call > an uncompress utility on the files from disk and repo, do the > merge/whatever, and then recompress again once finished?
On Wed, Apr 11, 2012 at 7:13 AM, David Weintraub <qazw...@gmail.com> wrote: [...] > So, uncompress them, and store them as pure XML files. Then, you can > use Subversion to track individual diffs and do your merges. By the > way, Subversion default diff and merge tools aren't too good for XML > because XML files aren't line oriented. Fortunately, you can specify > your own diff and merge tools when you use Subversion. Find a good XML > diff and merge tool for these files. Using a custom script as "external diff and merge tool" might actually also be a solution for the OP's question: write a specific merge-script for your *.bin files, which does "uncompress - merge - compress" on its arguments, and which can be used as external merge tool for SVN. See http://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html for some more info on using external tools for diffing and merging. That's the only thing I can think of. -- Johan
