Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 446422 - bzr.eclass might need to use bzr pull’s --overwrite-tags flag
Summary: bzr.eclass might need to use bzr pull’s --overwrite-tags flag
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Eclasses (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Ulrich Müller
Depends on: 487216 646764
  Show dependency tree
Reported: 2012-12-08 01:49 UTC by James Cloos
Modified: 2018-02-10 21:54 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Note You need to log in before you can comment on or make changes to this bug.
Description James Cloos 2012-12-08 01:49:57 UTC
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.
Comment 1 Ulrich Müller gentoo-dev 2012-12-08 08:24:26 UTC
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: <>

As a workaround, you can simply delete the conflicting tag in the local repo:
bzr tag --delete mh-e-8.4
Comment 2 James Cloos 2012-12-08 19:30:46 UTC
> 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.
Comment 3 Ulrich Müller gentoo-dev 2014-11-12 12:56:19 UTC
Emacs team is out of here.
Comment 4 Pacho Ramos gentoo-dev 2018-02-06 08:11:53 UTC
only to live ebuilds in the tree still need this eclass
Comment 5 Ulrich Müller gentoo-dev 2018-02-06 13:44:46 UTC
I have taken maintainership of the eclass.
Comment 6 Pacho Ramos gentoo-dev 2018-02-06 19:34:17 UTC
Great, thanks a lot! :)
Comment 7 Larry the Git Cow gentoo-dev 2018-02-10 21:54:52 UTC
The bug has been closed via the following commit(s):

commit 0b249d7175ae71e188e02ea60a90e9a932e2fda3
Author:     Ulrich Müller <>
AuthorDate: 2018-02-06 13:53:17 +0000
Commit:     Ulrich Müller <>
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(-)