Need configuration to manage LabView files

Andrew Bennetts andrew.bennetts at canonical.com
Tue Aug 24 08:12:48 BST 2010


Alexander Belchenko wrote:
> John Arbash Meinel пишет:
> > We also have a per-file merge hook. Such that you can write a plugin,
> > and look for files of this time, and try to use the custom merge tools.
> 
> It will be nice to have universal merge hook to invoke external merge
> application for specific files. This will simplify the life for many
> people, IMO.
> I don't think everybody should write that plugin for every possible
> merge tool, it's just does not sound right. And Ic an say about me

I agree, it would be nice to have a more convenient solution.  Having
the hook point at all is a step towards that, though.

> personally: I've tried to read and understand merge news hook plugin,
> and I've failed. It's a pure black magic for me.

That's a shame.  Have you tried reading the current version?  IIRC it
got better around 2.2b3 thanks to the PerFileMerger API.

I'd be happy to try explain how it works on list if you can point me in
the rough direction of where you get lost, it might help others
interested in writing similar hooks.  (And might be the start of some
more text to add to the docs.)

See also
<http://doc.bazaar.canonical.com/bzr.2.2/en/user-guide/hooks.html#example-a-merge-plugin>,
if you haven't already.

-Andrew.




More information about the bazaar mailing list