bzr merge always adds tags
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
This happened twice to me yesterday, but I'm not sure why or how.
I was trying to land the following branch in the Zope SVN repository:
lp:~justizin/zope.applicationcontrol/id_marker_lp_569541
and did something like the following (inside an already-populated shared
repo):
$ export ZSVN=svn+
$ bzr co $ZSVN/zope.
$ bzr branch svn/zope.
$ cd zope.applicatio
I then *meant* to do the following:
$ bzr merge lp:~justizin/zope.applicationcontrol/id_marker_lp_569541
but instead did:
$ bzr merge lp:~justizin/zope.annotation/id_marker_lp_569541
which cogitated for a while, including network activity, before reporting
that the two branches shared no common revisions (or something).
So I found my error, and made the originally-intended merge:
$ bzr merge lp:~justizin/zope.applicationcontrol/id_marker_lp_569541
and then (after testing):
$ bzr push :parent
which resulted in:
https:/
followed immediately by creation of bogus tags:
https:/
https:/
https:/
https:/
https:/
A similar problem bit me again later, working this time to land this branch:
lp:~justizin/zope.cachedescriptors/id_marker_lp_569541
with a botched merge from:
lp:~justizin/zope.browserresource/id_marker_lp_569541
where the "real" checkin:
https:/
was followed by bogus tag creation:
https:/
https:/
https:/
https:/
https:/
I have a half-baked theory that bzr might have been confused by an attempt
to merge an unrelated branch, but unfortunately didn't keep the bzr-svn
checkout around.
The Zope SVN repository is available read-only at:
svn:/
and also at:
tags: | added: merge tags |
"bzr merge" always pulls in remote tags, even if the branches are unrelated.