Using Emacs ediff as a Bazaar change editor
Ben Finney
ben+bazaar at benfinney.id.au
Thu Jun 7 02:29:41 UTC 2012
Howdy all,
I tend to use Bazaar from the command line, in a GNU Screen session,
usually without X access from that session. In another GNU Screen window
in the same session, I use Emacs as the editor, and enjoy its ‘ediff’
mode.
With recent talk about using an editor for resolving changes in Bazaar,
I'd like to know:
* What different Bazaar operations benefit from a change editor?
Resolving merge conflicts; selecting hunks to shelve; viewing diffs;
anything else?
* How can I best invoke (text-mode) ediff as a Bazaar change editor
command? <URL:http://www.emacswiki.org/emacs/EdiffMode> discusses many
variations of this, but I am hoping this is a solved problem in the
Bazaar context.
* Which ediff invocation is appropriate to each of the corresponding
Bazaar operations above? I think ‘ediff’ would be best for viewing
diffs, but ‘ediff-merge-files-with-ancestor’ for resolving conflicts,
for example.
--
\ “Skepticism is the highest duty and blind faith the one |
`\ unpardonable sin.” —Thomas Henry Huxley, _Essays on |
_o__) Controversial Questions_, 1889 |
Ben Finney
More information about the bazaar
mailing list