confusing ui about conflicts on updated tags
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Breezy |
Triaged
|
Medium
|
Unassigned |
Bug Description
Hello,
This might well be a duplicate (sorry) of an existing bug (#138802? #609197?), but I could not see that any of them explicitly mention this case. Using bzr 2.4.1:
mkdir 1
cd 1
bzr init
touch 1
bzr add 1
bzr commit -m "c1"
bzr tag tag1
cd ../
bzr branch 1 2
cd 1
touch 2
bzr add 2
bzr commit -m "c2"
bzr tag --force tag1
cd ../2
bzr pull
-> exits with non-zero status, prints "Conflicting tags: tag1"
This seems a bit weird, since tag1 has never been modified in branch 2, so why is there a conflict, why isn't it
just overwritten?
I know that I can use pull --overwrite (if no local changes in branch 2), but if there are local changes I have to use a more
complex method (as explained at http://
--overwrite-tags (#681792) would make it easier.
Anyway, this caused some confusion at Emacs recently:
http://
Because tags were re-used, everyone following the branch has to take non-standard steps to
update their local copies.
Changed in bzr: | |
status: | Incomplete → Confirmed |
importance: | Undecided → Medium |
summary: |
- reusing tags creates conflict on pulling into unmodified branch + confusing ui about conflicts on updated tags |
tags: | added: confusing-ui tags |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Medium |
When you ran "bzr tag --force tag1" you modified the tag with name "tag1" in branch 2.