[Openerp-community] 13 revisions removed from ocb-addons/7.0?
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? Best regards, -sbi [1] https://code.launchpad.net/~camptocamp/account-financial-report/7.0-sync-afr_webkit-with-report_webkit/+merge/223058/comments/536127 ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
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: ste...@therp.nl tel: +31 (0) 614478606 web: http://therp.nl ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
I'm making again the merges of these 4 MPs. Regards. 2014-06-18 11:53 GMT+02:00 Stefan : > 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: ste...@therp.nl > tel: +31 (0) 614478606 > web: http://therp.nl > > > ___ > Mailing list: https://launchpad.net/~openerp-community > Post to : openerp-community@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openerp-community > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
Done! Now, all OCB specific patches lost must be restored. Regards. 2014-06-18 16:26 GMT+02:00 Pedro Manuel Baeza Romero : > I'm making again the merges of these 4 MPs. > > Regards. > > > 2014-06-18 11:53 GMT+02:00 Stefan : > > 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: ste...@therp.nl >> tel: +31 (0) 614478606 >> web: http://therp.nl >> >> >> ___ >> Mailing list: https://launchpad.net/~openerp-community >> Post to : openerp-community@lists.launchpad.net >> Unsubscribe : https://launchpad.net/~openerp-community >> More help : https://help.launchpad.net/ListHelp >> > > ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
On 18-06-14 16:40, Pedro Manuel Baeza Romero wrote: Done! Now, all OCB specific patches lost must be restored. Thanks Pedo, looking good! Stefan. ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
On jeu. 19 juin 2014 10:36:08 CEST, Stefan wrote: > On 18-06-14 16:40, Pedro Manuel Baeza Romero wrote: >> Done! Now, all OCB specific patches lost must be restored. > > > Thanks Pedo, looking good! > > Stefan. > > > ___ > Mailing list: https://launchpad.net/~openerp-community > Post to : openerp-community@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openerp-community > More help : https://help.launchpad.net/ListHelp Thanks to all for fixing this. I did not know about push --overwrite, and I'll stick to what I said at open days about bound branches... :-) -- Alexandre Fayolle Chef de Projet Tel : + 33 (0)4 79 26 57 94 Camptocamp France SAS Savoie Technolac, BP 352 73377 Le Bourget du Lac Cedex http://www.camptocamp.com ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community] 13 revisions removed from ocb-addons/7.0?
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.ba...@gmail.com> 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.ba...@gmail.com>: > > I'm making again the merges of these 4 MPs. >> >> Regards. >> >> >> 2014-06-18 11:53 GMT+02:00 Stefan : >> >> 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: ste...@therp.nl >>> tel: +31 (0) 614478606 >>> web: http://therp.nl >>> >>> >>> ___ >>> Mailing list: https://launchpad.net/~openerp-community >>> Post to : openerp-community@lists.launchpad.net >>> Unsubscribe : https://launchpad.net/~openerp-community >>> More help : https://help.launchpad.net/ListHelp >>> >> >> > > ___ > Mailing list: https://launchpad.net/~openerp-community > Post to : openerp-community@lists.launchpad.net > Unsubscribe : https://launchpad.net/~openerp-community > More help : https://help.launchpad.net/ListHelp > > ___ Mailing list: https://launchpad.net/~openerp-community Post to : openerp-community@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
