uncommit should remove tags
Bug #605814 reported by
Martin Pitt
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Medium
|
Jelmer Vernooij | ||
Bug Description
A common workflow for Debian/Ubuntu packaging is :
* work on package
* dch -r/debcommit -r -> this will commit a change "release 1.2.3-4" and tag it with 1.2.3-4, i. e. the package version number
* build source and binaries
* notice something that you forgot, e. g. a small lintian complaint
* bzr uncommit, go back to square 1
The inconvenience here is that bzr uncommit does not automatically delete the tag. I have to manually "bzr tag --delete 1.2.3-4" after each uncommit, which is error prone, and also seems quite redundant.
Can uncommit destroy the tags as well, please?
Related branches
lp:~jelmer/bzr/uncommit-remove-tags
- Martin Pool: Approve
-
Diff: 231 lines (+89/-13)7 files modifiedbzrlib/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)
Revision history for this message
| John A Meinel (jameinel) wrote | #1 |
| Changed in bzr: | |
| importance: | Undecided → Medium |
| status: | New → Confirmed |
| tags: | added: tags uncommit |
| Changed in bzr: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| status: | Confirmed → In Progress |
| milestone: | none → 2.5b1 |
| Changed in bzr: | |
| status: | In Progress → Fix Released |
To post a comment you must log in.
This is somewhat related to other tag issues. For example, doing "bzr merge ../other/branch" will bring in the tags from the other branch but then doing "bzr revert" will not delete the tag.
If we ever get a tag staging area, then what might make the most sense would be to have 'uncommit' put the tag into that area. Like how today doing "bzr uncommit" will set the working tree to have the same merged revisions.