Code review comment for lp:~sbi/openobject-addons/trunk-bug1101811

Stéphane Bidoul (Acsone) (sbi) wrote :

Strange enough. On my side

bzr branch lp:openobject-addons

followsed by

bzr merge lp:~sbi/openobject-addons/trunk-bug1101811

works fine.

-sbi

Stéphane Bidoul
Operations Director | Acsone sa/nv | http://acsone.eu/
m +32 498 72 46 54 | t +32 2 888 3124 | f +32 2 888 3159

On Mon, Feb 25, 2013 at 7:06 PM, qdp (OpenERP) <email address hidden>wrote:

> Hello Stéphane,
>
> unfortunatelly, it seems that something went wrong when you did the merge
> proposal, as while i' trying to merge your branch i'm getting a lot of
> conflicts. Maybe you solve a conflicts by pushing with --overwrite?
>
>
> anyway, as the diff in launchpad was clear enough and very short i copied
> that by the hand.
>
>
> thanks for the bug spotting and its fixing :-)
> Quentin
> --
>
> https://code.launchpad.net/~sbi/openobject-addons/trunk-bug1101811/+merge/143991
> You are the owner of lp:~sbi/openobject-addons/trunk-bug1101811.
>

« Back to merge proposal