openerp-community team mailing list archive

[Bidoul, Stéphane <stephane.bidoul@xxxxxxxxx>]

Hi Pedro.

I tested again and it looks good now.

Thanks!

-sbi


On Wed, Jun 18, 2014 at 4:40 PM, Pedro Manuel Baeza Romero <
pedro.baeza@xxxxxxxxx> wrote:

> Done! Now, all OCB specific patches lost must be restored.
>
> Regards.
>
>
> 2014-06-18 16:26 GMT+02:00 Pedro Manuel Baeza Romero <
> pedro.baeza@xxxxxxxxx>:
>
> I'm making again the merges of these 4 MPs.
>>
>> Regards.
>>
>>
>> 2014-06-18 11:53 GMT+02:00 Stefan <stefan@xxxxxxxx>:
>>
>> On 18-06-14 09:36, Bidoul, Stéphane wrote:
>>>
>>>> Hi,
>>>>
>>>> On Friday June 13th, I received a notification from launchpad saying
>>>> that 13 revisions were removed from lp:ocaddons/7.0.
>>>>
>>>> Apparently some recent (and important) merges went out.
>>>>
>>>> See for instance, this [1] comment from Guewen.
>>>>
>>>> Does anyone know what happened or has information to help restore
>>>> missing revisions?
>>>>
>>>>
>>> Hi Stéphane,
>>>
>>> This is unfortunate. Apparently, someone from the committers team has
>>> pushed using --overwrite or is uncommitting on a bound branch. Thank you
>>> for noticing!
>>>
>>> It does explain the strange phenomenon that the replay process suddenly
>>> barked on local changes. I did not notice this discrepancy and had time to
>>> ponder over the matter so I just got the process going again. I'm sorry
>>> about that.
>>>
>>> Looking at the replay logs, I can confirm that on 2014-06-12, revision
>>> 10066 of lp:openobject-addons/7.0 was replayed as lp:ocb-addons/7.0, revno.
>>> 10206, while the next day, the ocb-branch was reverted to revision 10193.
>>> Given that revision 10066 was then replayed as ocb revision 10202,  we seem
>>> to be missing four ocb-specific revisions.
>>>
>>> My review mailbox (untouched for some time now, I'm afraid) tells me it
>>> concerns the following merges:
>>>
>>> https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1319109 was
>>> committed as 10194
>>> https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1319095 was
>>> committed as 10195
>>> https://code.launchpad.net/~therp-nl/ocb-addons/7.0-
>>> lp1315367-task_work_timesheet_lines_False was committed as 10202
>>> https://code.launchpad.net/~numerigraphe-team/ocb-addons/
>>> 7.0-fill-inventory-OOM was committed as 10204
>>>
>>> Can someone repeat these merges, please?
>>>
>>> Cheers,
>>> Stefan.
>>>
>>> --
>>> Therp - Maatwerk in open ontwikkeling
>>>
>>> Stefan Rijnhart - Ontwerp en implementatie
>>>
>>> mail: stefan@xxxxxxxx
>>> tel: +31 (0) 614478606
>>> web: http://therp.nl
>>>
>>>
>>> _______________________________________________
>>> Mailing list: https://launchpad.net/~openerp-community
>>> Post to     : openerp-community@xxxxxxxxxxxxxxxxxxx
>>> Unsubscribe : https://launchpad.net/~openerp-community
>>> More help   : https://help.launchpad.net/ListHelp
>>>
>>
>>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to     : openerp-community@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openerp-community
> More help   : https://help.launchpad.net/ListHelp
>
>