Search code examples
tortoisehg

Merge xls with TortoiseHg

I want to merge two MS Excel .xls files while updating the repository with TortoiseHg, and I get the following error: 

tool tortoisemerge can't handle binary
tool kdiff3 can't handle binary
tool tortoisemerge can't handle binary
tool docdiff can't handle binary
abort: response expected

When I add these lines to the hgrc file:

[merge-patterns]
**.xls = docdiff

I get another error:

merging test.xls
merging test.xls failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved

What am I doing wrong? When I run docdiff from command line it runs successfully.

Solution

  • I've solved the problem. Looks like I've tried automatic merge instead of manual one. Automatic merge of binaries is not supported, but I've figured out how to launch docdiff from TortoiseHG interface.

    So, the answer is: in order to merge .xls files with TortoiseHg one has to use manual merge with docdiff. TortoiseHg doesn't launch docdiff during automatic merge.