Merge lp://staging/~spiv/bzr/merge-into-merger into lp://staging/bzr/2.2
Proposed by
Andrew Bennetts
| Status: | Merged |
|---|---|
| Approved by: | Andrew Bennetts |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5066 |
| Proposed branch: | lp://staging/~spiv/bzr/merge-into-merger |
| Merge into: | lp://staging/bzr/2.2 |
| Diff against target: |
527 lines (+422/-9) 3 files modified
NEWS (+3/-0) bzrlib/merge.py (+177/-7) bzrlib/tests/test_merge.py (+242/-2) |
| To merge this branch: | bzr merge lp://staging/~spiv/bzr/merge-into-merger |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| bzr-core | Pending | ||
|
Review via email:
|
|||
Commit message
Add MergeIntoMerger, which can merge all or part of a tree from an unrelated branch into a new subdirectory.
Description of the change
This addresses all the review points from Robert's review and John's initial look. It's targetted to 2.2 because it makes no API breaks (it just adds a new API), so we may as well get it out there sooner rather than later.
As Robert already voted Approve on the last round, I intend to submit this to PQM straight away; this merge proposal is just to increase visibility of the change and make it simpler for me to submit to PQM :)
To post a comment you must log in.
Revision history for this message
| Andrew Bennetts (spiv) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
sent to pqm by email