handling conflicts in binary files.

[Erik Bågfors]

On Dec 7, 2007 2:32 PM, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Erik Bågfors wrote:
> > $ mv  'Picture 1.png.THIS' 'Picture 1.png.OTHER'
> > $ bzr mv 'Picture 1.png.OTHER' 'Picture 1.png'
> > $ bzr resolve 'Picture 1.png'
> > $ bzr ci -m 'merge'
> >
> > which is more than a little odd...
> > Is there no better way to handle this?
>
> You can do "bzr revert Picture 1.png".  You don't need '.OTHER', because
> revert will match the old name.  The idea was always that when we have
> to pick one version, we pick the version from the branch they are
> merging, because it's easy to get your own version back.

Ok, but it's still very unclear.  What I get is this

If I want .THIS, I can do:
"bzr revert file"
bzr commit

If I want .OTHER, I have to do,:
bzr mv file.OTHER file;
bzr resolve file;
bzr commit

If I want to run a separate binary diff program for my specific binary
document type, I have to do (assuming the software writes a file
without extensions)
my-diff-app file.BASE file.OTHER file.THIS
# This creates "file"

mv file file.OTHER
bzr mv file.OTHER file
bzr resolve file
bzr commit

is this correct?

/Erik