← Back to team overview

openerp-community-reviewer team mailing list archive

Problem on branch lp:openerp-product-attributes/6.1

 

Hello reviewers,

We have a problem with the branch lp:openerp-product-attributes/6.1
It has been generated without the history of the modules, without an common ancestor with extra-addons and with some modules which where more recent on another branch.

The only solution I found is to completely rebuild the branch from an extra-addons' common ancestor, using bazaar-extractor.

Here is my 'merge' proposal:
https://code.launchpad.net/~product-core-editors/openerp-product-attributes/new6.1/+merge/143657

I would be pleased to have your comments.
My solution (overwrite the branch) really upset me, but I didn't found any other way, so if someone has a better one, it will be much appreciated.

We have to act as soon as possible, because the replacement of the branch will definitely trouble some people (there is already a merge proposal on the 'broken' branch).

Thanks,
Have a nice day and week-end,


--
Guewen Baconnier
Business Solutions Software Developer

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: +41 21 619 10 39
Office: +41 21 619 10 10
http://www.camptocamp.com/