lp:~acsone-openerp/anybox.recipe.openerp/git-merges

Branch merges

Propose for merging

1 branch dependent on this one.

Merged into lp:anybox.recipe.openerp at revision 533

Georges Racinet: Approve on 2014-06-16

Raphaël Valyi - http://www.akretion.com (community): Approve on 2014-06-13

Laurent Mignon (Acsone) (community): Approve (code, tested) on 2014-06-10

Stefan Rijnhart (Opener): Pending requested 2014-06-10

Diff: 370 lines (+161/-117)

5 files modified

anybox/recipe/openerp/base.py (+4/-2)
anybox/recipe/openerp/vcs/base.py (+3/-0)
anybox/recipe/openerp/vcs/bzr.py (+3/-0)
anybox/recipe/openerp/vcs/git.py (+68/-113)
anybox/recipe/openerp/vcs/tests/test_git.py (+83/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1327773: Implement merges and vcs-revert for git

Undecided

Fix Committed

Link a bug report

Related blueprints

535. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] comments and logging

534. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] basic test for git merge and revert

533. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] slight refactoring of git interface

532. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] looks like archive should be part of the vcs interface

531. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] git merge: use --no-edit to accept default mechanical merge messages

530. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] improve revert and tracing

TODO: unit tests and using logger instead of print

529. By Stéphane Bidoul (Acsone) on 2014-06-08

[IMP] git: implement merges and vcs-revert

Attempt to simplify the code a bit

528. By Georges Racinet on 2014-06-08

[MRG] general merge from stable branch, notably odoo 8.0 adaptations

527. By Georges Racinet on 2014-06-08

[buildbot] typo in MANIFEST

526. By Georges Racinet on 2014-06-08

[buildbot] added odoo builds (only stable can work for now)