Confusing message from "bzr resolve"

Ben Finney ben+bazaar at benfinney.id.au
Sat Jan 16 22:35:06 GMT 2010


Eli Zaretskii <eliz at gnu.org> writes:

> > In this case, it is Emacs who introduces the confussion. IMO it
> > should advertise that it removed the conflict mark for that file.
>
> Possibly.  But what else is wrong is that the BzrForEmacsDevs wiki
> page says you should do it manually, whereas in most cases you don't.
> I just fixed that.

It wasn't the case for quite a while (by which I mean, Emacs VC would
not resolve conflicts in Bazaar). I don't know how recently that
changed.

Who is responsible for Emacs VC? Would they be so kind as to say when
this behaviour changed? That would be good information for the
BzrForEmacsDev page.

-- 
 \            “… Nature … is seen to do all things Herself and through |
  `\         herself of own accord, rid of all gods.” —Titus Lucretius |
_o__)                                                 Carus, c. 40 BCE |
Ben Finney




More information about the bazaar mailing list