Merge lp://qastaging/~gz/bzr/2.5_backport_rmbranch_fixes into lp://qastaging/bzr/2.5
Proposed by
Martin Packman
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Martin Packman | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 6500 | ||||||||
| Proposed branch: | lp://qastaging/~gz/bzr/2.5_backport_rmbranch_fixes | ||||||||
| Merge into: | lp://qastaging/bzr/2.5 | ||||||||
| Diff against target: |
220 lines (+95/-23) 4 files modified
bzrlib/builtins.py (+47/-14) bzrlib/tests/blackbox/test_rmbranch.py (+41/-8) bzrlib/tests/blackbox/test_switch.py (+1/-1) doc/en/release-notes/bzr-2.5.txt (+6/-0) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~gz/bzr/2.5_backport_rmbranch_fixes | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Backport fixes to rmbranch on colocated branches from 2.6
Description of the change
Backports from 2.6 fixes related to rmbranch which have caught out several people when working with colocated branches. Both bugs are included, as the second which fixes the specific issue of accidentally removing your active branch depends on some changes made in the first.
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
(code)
Revision history for this message
| Martin Packman (gz) wrote | # |
Revision history for this message
| Martin Packman (gz) wrote | # |
Revision history for this message
| Martin Packman (gz) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
sent to pqm by email