Emacs, bzr, ... (was Re: new status output)
Matthieu Moy
Matthieu.Moy at imag.fr
Fri Oct 21 12:11:46 BST 2005
Scott James Remnant <scott at ubuntu.com> writes:
> http://people.ubuntu.com/~scott/software/bzr-conflicts.el
>
> It took all of about 5 minutes to convert <g>
>
> (For the baz one, grab baz-conflicts.el instead).
We have something similar for baz in Xtla (except that we don't show a
buffer containing /only/ conflicted files, but all the output of baz
status. Opening a file in conflicted state enters smerge mode
automatically, and you have a M-x baz-resolved RET that will warn you
if you still have conflicts markers, and delete the .rej file (that's
comming from my habit to put \.rej$ in unrecognized with tla) and run
baz resolved.
I really should get time to work on bzr support. Did you subscribe to
Xtla's mailing list ( https://mail.gna.org/listinfo/xtla-el-dev )
(That's a low trafic ML)? Our philosophy is to join the efforts as
much as possible so we're interested in discussion and code exchange
with anyone writting things about Emacs + [ baz | tla | bzr | hg ].
--
Matthieu
More information about the bazaar
mailing list