lp://staging/~rom1-chal/bzr-builder/merge-all-what-can-be

As a release manager, I use bzr-builder from a cron robot that merges all the candidate branches for a defined release. I can have many branches to be integrated in a target branch from many developers and the nightly build helps me in reducing the integration phase by sending to concerned developers the conflicts as soon as detected.

The builder stops at the first encountered conflict so it can prevent from getting the potential impacts between the candidate branches, abolve all if the developer is not present to correct it.

So i hacked the builder to have the --merge-what-can-be option :
If a conflict is raised during a merge, with such an option set, it reports the conflict, reverts the changes and goes on with the other instructions.

I also modified the reporting to have a nicely rendered ReST reporting used to add to an email (after a docutils transformation to html) or save in a directory.

To be fixed :
 - The code does not include unit tests. I have used manually done tests to improve it...
- Only the text conflicts have been tested in conflicts raised.
- Did not implement the nest part conflicts
- Did not implement a report on command instruction.

Today, i use this beta code on one production project.

The generated report is :

------------
Build report
------------

Build of branch mel:melanie_test/builder/intg from recipe ``recipe``

+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| Status | Branch | Revno | Message |
+========+================================+=======+=====================================================================================+
| OK | mel:melanie_test/builder/intg | 1 | None has been retrieved. |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| OK | mel:melanie_test/builder/test2 | 2 | branch2 is already merged in mel:melanie_test/builder/intg. |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| NOK | mel:melanie_test/builder/test1 | 3 | Conflicts have been detected while merging branch1 in mel:melanie_test/builder/intg |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| | ``toto`` (modifications from rchalumeau@echo.fr, toto@tutu.com) |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| OK | mel:melanie_test/builder/test3 | 2 | branch3 has been merged in mel:melanie_test/builder/intg and committed |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+
| OK | mel:melanie_test/builder/test4 | 3 | branch4 is already merged in mel:melanie_test/builder/intg. |
+--------+--------------------------------+-------+-------------------------------------------------------------------------------------+