ocb team mailing list archive

[Stefan Rijnhart <stefan@xxxxxxxx>]

Hi Alexandre,

thanks for your reply. I reverted revision 9210 (see [1]) and then the 
replay of recent commits from lp:openobject-addons/7.0 proceeded 
succesfully.

Cheers,
Stefan.

[1] http://bazaar.launchpad.net/~ocb/ocb-addons/7.0/revision/9367


-------- Original Message --------
Subject: 	Re: [Ocb] ocb-addons/7.0 conflicts in stock.py, mrp.py
Date: 	Wed, 31 Jul 2013 16:05:53 +0200
From: 	Alexandre Fayolle <alexandre.fayolle@xxxxxxxxxxxxxx>
To: 	Stefan Rijnhart <stefan@xxxxxxxx>



I'm currently on vacation and not directly available to work on this 
until Aug 20. I had explicitely asked for the inclusion of the tests in 
the OPW... sigh...

I guess I'll open a new OPW when I get back to get the missing parts. In 
the meantime, I think the best course is to revert the patch I had 
merged inOCB and to move on.

Thanks for keeping an eye on this.

Alexandre


2013/7/31 Stefan Rijnhart <stefan@xxxxxxxx <mailto:stefan@xxxxxxxx>>

   Hi,

   unfortuntely, the OpenERP devs decided to fix
   https://launchpad.net/bugs/1182111 independently of the available
   community fix by Alexandre Fayolle. The fixes are implemented in
   lp:openobject-addons/7.0, rev. 9328, 9329 and 9335. These revisions
   conflict with lp:ocb-addons/7.0, rev. 9210.

   As far as I can see, the patches are roughly equivalent. Both
   versions seem to miss one or two of the occurrences of the problem.
   Of course, the core patches do not include Alexandre's beautiful
   tests. What I would like to suggest is to reverse merge Alexandre's
   fix on ocb-addons/7.0 (bzr merge :parent -r 9210..9209) so that the
   core changes can be committed as is. Please review the attached diff
   file which reflects the outcome of that proces. Please let me know
   if you can live with that and I can do it on short notice.

   We would have to request Alexandre to resubmit the tests and the
   occurrences that the core devs missed in a separate proposal, if he
   thinks that it is worth the trouble.

   The nightly replay task on this ocb-branch will stall due to the
   conflict until this is resolved.

   Cheers,
   Stefan.