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

Viewing all changes in revision 106.

  • Committer: Romain Chalumeau
  • Date: 2010-09-16 10:33:54 UTC
  • Revision ID: rchalumeau@echo.fr-20100916103354-e3zdkv05ixwsn0e3
* Implementation of merge-what-can-be to merge as many branches from the recipe as possible. When a conflict is raised, it reports it and revert the merge to continue on the next recipe order. 
* Actions reported in a global dict to generate a ReST report

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: