difftools, ‘bzr diff --using footool’ , and ‘diffuse’
Stephen Ward
sward.dev at verizon.net
Sat Apr 4 00:40:19 BST 2009
Hi Ben,
The problem is that 'diffuse' doesn't know how to deal with directories, so
the default behavior of the 'difftools' plugin messes it up (it defaults to a
tree-oriented use-model). This can be trivially fixed by adding one line to
controller.py:
register_diff_tool(TreeDiffTool('fldiff'))
+register_diff_tool(ListDiffTool('diffuse'))
register_diff_tool(ListDiffTool('gvim', diff_options='-f -d'))
Or, of course, you can use the builtin implementation of 'diff --using', which
works just fine for any of the list-oriented diff tools.
Regards,
Steve
More information about the bazaar
mailing list