lp:~spiv/bzr-builder/merge-subdirs-479705

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builder at revision 100

James Westby: Pending requested 2010-08-13

Diff: 19 lines (+3/-3)

1 file modified

__init__.py (+3/-3)

api

On hold for merging into lp:~james-w/bzr-builder/trunk-old

Andrew Bennetts (community): Disapprove on 2010-07-29

James Westby: Needs Fixing on 2010-07-08

Diff: 2784 lines (+1496/-600)

10 files modified

TODO (+0/-3)
__init__.py (+33/-377)
cmds.py (+492/-0)
ppa.py (+124/-0)
recipe.py (+421/-150)
setup.py (+13/-12)
tests/__init__.py (+4/-3)
tests/test_blackbox.py (+62/-16)
tests/test_ppa.py (+28/-0)
tests/test_recipe.py (+319/-39)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #479705: merge subdirs

High

Fix Released

Link a bug report

Related blueprints

73. By Andrew Bennetts on 2010-08-12

Tweak plugin help text.

72. By Andrew Bennetts on 2010-08-12

Change the syntax of nest-part to have the revspec at the end, and make it optional.

71. By Andrew Bennetts on 2010-07-29

Merge trunk.

70. By Andrew Bennetts on 2010-07-29

Rename merge-part instruction to nest-part.

69. By Andrew Bennetts on 2010-06-25

Rename 'merge-into' instruction to 'merge-part'.

68. By Andrew Bennetts on 2010-06-22

Reduce cruft slightly.

67. By Andrew Bennetts on 2010-06-22

Bump format, add tests for parsing of merge-into, revert unused change to allow 'merge' instructions to take subpaths.

66. By Andrew Bennetts on 2010-06-22

Expand docstrings, and allow specifying a target subdir.

65. By Andrew Bennetts on 2010-06-18

Define a new 'merge-into' instruction.

64. By Andrew Bennetts on 2010-06-17

Make merge_unrelated_branch work using my merge-into-merger branch of bzrlib.