The emacs trunk pull started failing when updating app-editors/emacs-vcs-24.3.9999 due to a tag conflict. (One of the tags in the upstream repository was modified to point at a different revision.)
Had the eclass used --overwrite the conflict would have been automatically resolved by trusting upstream over the local cache of the branch.
Given how the eclass uses bzr, that would seem to be the preferred option in such cases. At least at first glance.
Without that, in order to get emerge to update that package, one must either manually modify the local copy or must mv(1) it and start anew — a ¼-Gig download.
Yes, the tag for mh-e-8.4. Upstream shouldn't do such things, in the first place. (And I thought bzr push would refuse it, unless used with --force.)
I'd suggest though that we don't use --overwrite but wait for the more specific --overwrite-tags that will hopefully appear in bzr-2.6: <https://bugs.launchpad.net/bzr/+bug/681792>
As a workaround, you can simply delete the conflicting tag in the local repo:
bzr tag --delete mh-e-8.4
> I'd suggest though that we don't use --overwrite but wait for the more specific > --overwrite-tags that will hopefully appear in bzr-2.6
Ah. I didn’t know about that one; sounds like a plan.
Emacs team is out of here.
only to live ebuilds in the tree still need this eclass
I have taken maintainership of the eclass.
Great, thanks a lot! :)
The bug has been closed via the following commit(s):
Author: Ulrich Müller <email@example.com>
AuthorDate: 2018-02-06 13:53:17 +0000
Commit: Ulrich Müller <firstname.lastname@example.org>
CommitDate: 2018-02-10 21:50:59 +0000
bzr.eclass: Add --overwrite-tags option to pull command.
eclass/bzr.eclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)