Question

i want to run a batch file after a merge operation to resolve certain conflicts automatically.

any ideas?

post_merge_hook will work just fine but i didnt find any references for it existence

thanks

Gil Idelson

Answer 1

There is no post-merge hook in Bazaar. Your best bet is to make a shell alias or batch file which executes the merge and then your conflict resolution tool.

Another alternative is to create a plugin which registers a merge_file_content hook that controls how bzr merges specific files. Since bzr 2.4, there is bundled plugin called news_merge which demonstrates how this can be used. You may also want to read about hooks in the user guide.

Unless the standard merge algorithms really cannot handle your special files correctly, I would recommend the first option.