Cherrypick from unrelated branch pulls all tags, that may be undesirable
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
High
|
Unassigned |
Bug Description
C:\Temp>mkdir 1
C:\Temp>cd 1
C:\Temp\1>
C:\Temp\1>bzr init a
Created a standalone tree (format: 1.14)
C:\Temp\1>cd a
C:\Temp\1\a>
C:\Temp\1\a>bzr ci -m1 --unchanged
Committing to: C:/Temp/1/a/
Committed revision 1.
C:\Temp\1\a>bzr tag 1.0
Created tag 1.0.
C:\Temp\1\a>bzr ci -m2 --unchanged
Committing to: C:/Temp/1/a/
Committed revision 2.
C:\Temp\1\a>bzr tag 2.0
Created tag 2.0.
C:\Temp\1\a>echo > foo
C:\Temp\1\a>bzr add foo
adding foo
C:\Temp\1\a>bzr ci -m foo
bzr: warning: The commit message is a file name: "foo".
(use --file "foo" to take commit message from that file)
Committing to: C:/Temp/1/a/
added foo
Committed revision 3.
C:\Temp\1\a>bzr tags
1.0 1
2.0 2
C:\Temp\1\a>cd ..
C:\Temp\1>
C:\Temp\1>bzr init b
Created a standalone tree (format: 1.14)
C:\Temp\1>cd b
C:\Temp\1\b>
C:\Temp\1\b>echo > bar
C:\Temp\1\b>bzr add && bzr ci -m bar
adding bar
bzr: warning: The commit message is a file name: "bar".
(use --file "bar" to take commit message from that file)
Committing to: C:/Temp/1/b/
added bar
Committed revision 1.
C:\Temp\1\b>bzr tags
C:\Temp\1\b>bzr merge ../a/foo -r0..-1
+N foo
All changes applied successfully.
C:\Temp\1\b>bzr tags
1.0 ?
2.0 ?
Tags pulled from unrelated branch in that case is undesirable side effect which is not expected at all. Imagine if you have about of 50 tags (as I have) and you need to remove them. Today the only quick hack I can use is to edit manually .bzr/branch/tags file, e.g.
echo de > .bzr/branch/tags
to remove all tags.
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → High |
tags: | added: cherrypick merge |
tags: | added: check-for-breezy |
tags: | removed: check-for-breezy |