Merge lp:~mgiuca/bzr/remove-tree-shelved into lp:bzr
Proposed by
Matt Giuca
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Martin Pool | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5282 | ||||
Proposed branch: | lp:~mgiuca/bzr/remove-tree-shelved | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
73 lines (+29/-1) 3 files modified
bzrlib/builtins.py (+3/-1) bzrlib/errors.py (+6/-0) bzrlib/tests/blackbox/test_remove_tree.py (+20/-0) |
||||
To merge this branch: | bzr merge lp:~mgiuca/bzr/remove-tree-shelved | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Alexander Belchenko | Approve | ||
Review via email: mp+26272@code.launchpad.net |
Commit message
remove-tree now refuses to run without --force if there are shelved changes. (#586639)
Description of the change
remove-tree now refuses to run without --force if there are shelved changes. (#586639)
Added two new test cases (./bzr selftest remove-tree).
To post a comment you must log in.
Looks good for me.