Confusing message from "bzr resolve"

Óscar Fuentes ofv at wanadoo.es
Sat Jan 16 23:36:53 GMT 2010


Ben Finney <ben+bazaar at benfinney.id.au> 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.

Several months, at least.

> 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.

Considering that the mentioned wiki page is aimed at Emacs developers,
and those use mostly the development version of Emacs, it is not
important to pinpoint the version that introduced the feature. In case
that someone uses an older version, the worst thing that could happen is
to create a bit of surprise when he will be forced to execute the
resolve command explicitly.

-- 
Óscar




More information about the bazaar mailing list