How to deal with conflicts in binary files?

[Robert Collins]

On Tue, 2008-08-26 at 16:04 +1200, Patrick van der Velde wrote:
> 
> 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.

not 'bzr mv', just plain 'mv' - the THIS, BASE, OTHER files are there as
suppporting-data, not as versioned files :).

e.g.
$ mv MyBinaryFile.bin.OTHER MyBinaryFile.bin
$ bzr resolve MyBinaryFile.bin

For the delete, I would suggest (done first):
$ bzr revert -r -1 MyBinaryFile.bin

But that will clean up the conflict too (I think); so the entire process
is
$ cp MyBinaryFile.bin.OTHER saved-OTHER
$ bzr revert -r -1 MyBinaryFile.bin
$ mv saved-OTHER MyBinaryFile.bin

-Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080827/85382fa9/attachment.pgp