handling conflicts in binary files.

Aaron Bentley aaron.bentley at utoronto.ca
Fri Dec 7 13:32:49 GMT 2007


-----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.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHWUuB0F+nu1YWqI0RAqTDAJsH7MJQU3k/qxt+ZgrqU3wxflbrjwCdHilL
K7YeYjuxO2Igvhv5BIL7pHk=
=rLl9
-----END PGP SIGNATURE-----



More information about the bazaar mailing list