PQM and conflicts

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Nicholas Allen wrote:
> Aaron Bentley wrote:
>> True, but you can specify a custom merge algorithm, and *it* can behave
>> differently for that single file.
> 
> That sounds interesting. Could you give some pointers to information on
> how to do this? I guess it involves hacking on the Bazaar code?

Yes.  You would typically subclass bzrlib.merge.Merge3Merger, which is
the implementation of our standard merge algorithm.  You would override
Merge3Merger.text_merge.  merge.Diff3Merger is a good example of
deriving from Merge3Merger.

Then you would register your new merge algorithm with
options._merge_type_registry.

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

iD8DBQFGvcA50F+nu1YWqI0RAosvAJ9Yx2kZcT2J9Vz7YdShMGakww0ErgCdEbDT
/4RbImhNj1IZtNut6SeXlMk=
=JcPZ
-----END PGP SIGNATURE-----