bug and proposed fix in "bzr merge --pull --merge"

[Martin Pool]

On 14 April 2011 05:47, Denys Duchier <denys.duchier at univ-orleans.fr> wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
>
>> That seems feasible to me. Do you have time to turn it into a full patch
>> (with a test, etc)? Or even just file a bug so we can keep track of this?
>
> Hi John, I just filed a bug.  Unfortunately, the issues with the
> "canonical contributor agreement" were never (realistically) addressed,
> which is why I have stopped attempting to contribute.  So, sorry, no
> full patch.

Thanks for pointing out the problem, anyhow.   I don't want to rehash
it all here but I might mention
<http://allisonrandal.com/2011/04/12/harmony-history/> and drafts are
now available of the document that will replace Canonical's
contributor agreement (among others.)  I am not asserting this will
address all of Denys's issues but it does fix some things that are
simple bugs.

Martin