Flexible external diff and external merge support
Coming from TortoiseSVN, I''ve encountered the lack of support for 3rd party visual diff and merge programs in Bazaar.
What standard setup offers by default is qdiff, it renders nicely, but it's read-only. While using TSVN, I've used to verify my changes and fix accidental ones through external diff tool (like Beyond Compare or Araxis Merge).
There are 2 extension points I was able to find:
* --using switch for diff command for calling external diff tools, but it's implementation is too bound to unix diff command, I don't know how to correctly launch Araxis Merge or Beyond Compare from 'bzr diff', without additional hacking
* extmerge plugin, it provides support for %THEIR, %BASE %THIS metaarguments, but it's only for merge, not for diff, and it could only support single external tool via conf file
IMO, Bazaar or some officially supported plugin should support flexible configuration of external diff/merge tools with %BASE, %THIS, %OTHER meta-arguments, just like it was done in TSVN. No need for special configuration section in bazaar.conf, command aliases would suite perfectly. IMHO, this feature is basic enough to include into bazaar core.
Now, I've come to my question. Am I correct in stating that currently there's no flexible way to configure bazaar to use 3rd party diff/merge tools? Is there already some initiative to eliminate such omittance?
Question information
- Language:
- English Edit question
- Status:
- Solved
- For:
- Bazaar Edit question
- Assignee:
- No assignee Edit question
- Solved by:
- Martin Pool
- Solved:
- Last query:
- Last reply: