Merge lp:~jelmer/bzr/uncommit-remove-tags into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jelmer Vernooij | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6094 | ||||
Proposed branch: | lp:~jelmer/bzr/uncommit-remove-tags | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
231 lines (+89/-13) 7 files modified
bzrlib/builtins.py (+9/-6) bzrlib/tests/blackbox/test_uncommit.py (+16/-2) bzrlib/tests/test_uncommit.py (+27/-0) bzrlib/uncommit.py (+26/-1) bzrlib/vf_repository.py (+4/-4) doc/en/release-notes/bzr-2.5.txt (+4/-0) doc/en/user-guide/undoing_mistakes.txt (+3/-0) |
||||
To merge this branch: | bzr merge lp:~jelmer/bzr/uncommit-remove-tags | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Review via email: mp+72403@code.launchpad.net |
Commit message
Remove tags in `bzr uncommit`.
Description of the change
Finishing off some code that I still had around in my working area...
Remove tags when uncommitting revisions. A new option --keep-tags prevents
this behaviour.
To post a comment you must log in.
That's good.
[tweak] It's a bit safer to add new keyword parameters at the end.
[tweak] Please mention it in the user guide under uncommit.