How to deal with conflicts in binary files?

[Patrick van der Velde]

Hi All

I've just had to merge two branches which both had a binary file with
changes. When I called bzr merge my branches were merged correctly but the
binary files conflicted (obviously). This is expected and not a real
problem. My problem is in how to solve the conflict. The manual says to bzr
mv one of the renamed files (THIS, BASE, THEIRS) to original file name
however because none of these files are versioned bzr can't perform the
rename. On top of that the original file is removed.
So the status after the merge looks like:

removed
  MyBinaryFile.bin
modified
  ... all my changed txt based files ...
unknown
  MyBinaryFile.bin.THIS
  MyBinaryFile.bin.THEIRS
  MyBinaryFile.bin.BASE
conflicted
  MyBinaryFile.bin

I've tried renaming one of the MyBinaryFile.bin.XXXXX to MyBinaryFile.bin
but then bzr still removes the reference to the file which means that the
file is unknown to bzr until I re-add it. This strikes me as a little weird
because the file was present in both branches that were merged so I wouldn't
expect it to disappear.  Now I'm sure bzr is doing the 'right' thing but is
there a way to make bzr automatically add my file or overwrite the old file
etc. etc. In short I want to know how to make this work without having to
re-add the binary file (which I could potentially forget).

Thanks heaps

Patrick
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20080826/afc679cd/attachment.htm