PQM and conflicts
aaron.bentley at utoronto.ca
Sat Aug 11 14:57:13 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar