Merge lp:~jelmer/bzr/rmbranch-active into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~jelmer/bzr/rmbranch-active | ||||
Merge into: | lp:bzr | ||||
Prerequisite: | lp:~jelmer/bzr/rmbranch-colo | ||||
Diff against target: |
129 lines (+46/-10) (has conflicts) 3 files modified
bzrlib/builtins.py (+12/-2) bzrlib/tests/blackbox/test_rmbranch.py (+31/-8) doc/en/release-notes/bzr-2.5.txt (+3/-0) Text conflict in doc/en/release-notes/bzr-2.5.txt |
||||
To merge this branch: | bzr merge lp:~jelmer/bzr/rmbranch-active | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Needs Information | ||
Review via email: mp+94555@code.launchpad.net |
This proposal supersedes a proposal from 2012-02-23.
This proposal has been superseded by a proposal from 2012-02-28.
Description of the change
Refuse removing active branches (branches associated with a working tree) in 'bzr rmbranch'.
Users can force the removal of such branches with the new --force argument to 'bzr rmbranch'.
To post a comment you must log in.
As per the prerequisite, if this should now be landing on dev as the targeting suggests, the release notes need moving. However, this seems like a colo ui issue that would be nice to fix on the 2.5 branch.
+ gettext("Use --force to remove active branch."))
This should probably state what it has (not) done, rather than just how to do the foot shooting.
Perhaps "Keeping active branch, use --force to really remove it." or something.
Code and tests look fine.