openerp-community-reviewer team mailing list archive
-
openerp-community-reviewer team
-
Mailing list archive
-
Message #01139
Re: [Merge] lp:~jeffery9/ocb-addons/ocb-addons-fixups into lp:ocb-addons
I'm seeing that OpenERP has planned to include the fixes on stable v7, so it's very important that you make the changes exactly the same (spaces, indentation and so on), in order to not get conflicts when the fix will be merged on main branch.
This can be with the "bzr diff" command to extract changes from the fix branch, and apply it with "patch" command.
Thank you for your understanding.
--
https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons-fixups/+merge/194463
Your team OpenERP Community Backports Team is subscribed to branch lp:ocb-addons.
References