openerp-community-reviewer team mailing list archive

Thread
Date

Re: [Merge] lp:~camptocamp/ocb-addons/7.0-fix-1220732 into lp:ocb-addons

To: mp+183911@xxxxxxxxxxxxxxxxxx
From: "Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>
Date: Wed, 16 Oct 2013 18:28:47 -0000
In-reply-to: <20131016170046.27618.76936.launchpad@ackee.canonical.com>
Reply-to: mp+183911@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Review: Needs Fixing

Thanks for the update. Unfortunately, the change sets are still not equal (rml spacing, target_move field in _columns). When I test merging both branches on OCB, I also get a conflict on the binary sxw file. Could you please reverse merge all your changes to this branch, commit, then cherrypick the OPW branch?

-- 
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1220732/+merge/183911
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons.

References

[Merge] lp:~camptocamp/ocb-addons/7.0-fix-1220732 into lp:ocb-addons
From: Yannick Vaucher @ Camptocamp, 2013-10-16