Merge lp://staging/~abentley/bzr-builder/launchpad into lp://staging/~launchpad-pqm/bzr-builder/trunk
Proposed by
Aaron Bentley
Status: | Merged |
---|---|
Merged at revision: | 66 |
Proposed branch: | lp://staging/~abentley/bzr-builder/launchpad |
Merge into: | lp://staging/~launchpad-pqm/bzr-builder/trunk |
Diff against target: |
963 lines (+566/-67) 7 files modified
__init__.py (+23/-1) bzrlibbackports.py (+227/-0) cmds.py (+21/-6) recipe.py (+150/-25) setup.py (+1/-1) tests/test_blackbox.py (+12/-4) tests/test_recipe.py (+132/-30) |
To merge this branch: | bzr merge lp://staging/~abentley/bzr-builder/launchpad |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paul Hummer (community) | Approve | ||
Review via email: mp+34424@code.staging.launchpad.net |
Description of the change
This is just a merge of tip of bzr-builder, so that we get the --safe flag and
the parse supports the permitted_
To post a comment you must log in.