Hello,
From my point of view, we should stick as much as possible to official
branch.
So as long as the fix of Martin Trigaux works as expected, we should revert
my fix and keep his last work.
I'll check this ASAP.
Cheers,
Yannick
On Fri, Apr 25, 2014 at 9:24 PM, Stefan ste...@therp.nl
Ok didn't see it was for
https://bugs.launchpad.net/openobject-addons/+bug/1180769 (bug is not
linked)
You were right Stefan those are 2 different bug fixes.
I'll resolve the conflict.
On Mon, Apr 28, 2014 at 10:27 AM, Yannick Vaucher
yannick.vauc...@camptocamp.com wrote:
Hello,
From my
Hello,
Here is the conflict resolution for OCB
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-resolve-conflict-10015/+merge/217454
Please give it some love.
In the mean time I found a bug in rev 10015 which I resolve at the same
time.
@Martin Trigaux could you have a look at
On 04/28/2014 04:39 PM, Yannick Vaucher wrote:
Hello,
Here is the conflict resolution for OCB
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-resolve-conflict-10015/+merge/217454
https://code.launchpad.net/%7Ecamptocamp/ocb-addons/7.0-resolve-conflict-10015/+merge/217454
Please give
On 04/28/2014 10:15 PM, Stefan Rijnhart wrote:
beaten to us
has beaten us to it...
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to : openerp-community-reviewer@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-community-reviewer
More help :
Kudos for your great work, Stefan, Yannick and Martin!!
Regards.
2014-04-28 22:16 GMT+02:00 Stefan Rijnhart ste...@therp.nl:
On 04/28/2014 10:15 PM, Stefan Rijnhart wrote:
beaten to us
has beaten us to it...
--
Mailing list: https://launchpad.net/~openerp-community-reviewer
Post to
Dear community reviewers,
news from the OCB-replay front here. We have had a couple of trivial
conflicts recently, caused by OpenERP developers fixing bugs in the 7.0
branches that are already fixed in OCB but more or less differently
(sometimes because they were unaware of the community fix, and
7 matches
Mail list logo
