[Python-mode] bazaar merge oddity

[Andreas Roehler]

Hi Barry,

after a merge bazaar requires a local commit nonetheless.

However, the difficulty and confusion IMHO arises from
the commit-message, necessary that way also.

As you may see in the current trunk now, your revision
353 is gone completely.

It's place is taken by my patch, while your changing
appears as rev 354 but with my commit message.

Or made I some mistake?

Cheers

Andreas

--
https://code.launchpad.net/~a-roehler/python-mode
https://code.launchpad.net/s-x-emacs-werkstatt/