From: Bill Wohler <wohler@newt.com>
To: emacs-devel@gnu.org
Subject: Re: How to resolve: Conflicting tags: mh-e-8.4
Date: Mon, 21 Jan 2013 11:58:56 -0800 [thread overview]
Message-ID: <87zk02fgu7.fsf@olgas.newt.com> (raw)
In-Reply-To: 7bhamjwv8i.fsf@fencepost.gnu.org
Glenn Morris <rgm@gnu.org> writes:
> Leo Liu wrote:
>
>> When I push a commit to trunk, I am seeing this odd alarming message:
>> Conflicting tags: mh-e-8.4
>>
>> How can I get rid of it? Thanks.
>
> Pretty sure I've explained this at least twice on this list. Eg
>
> http://lists.gnu.org/archive/html/emacs-devel/2011-09/msg00490.html
In that email you mention that you haven't seen this with bound,
authenticated branches. This does seem like a deficiency of Bazaar in
that you have to align the planets to avoid this problem. When I push an
unbound branch with a new tag, the Right Thing Should Happen.
Regardless, I'll make sure that I'm operating on a bound branch of trunk
next time I tag. I apologize for the trouble.
--
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD
next prev parent reply other threads:[~2013-01-21 19:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 15:54 How to resolve: Conflicting tags: mh-e-8.4 Leo Liu
2013-01-14 17:05 ` Glenn Morris
2013-01-14 17:09 ` Leo Liu
2013-01-21 19:58 ` Bill Wohler [this message]
2013-01-22 3:06 ` Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zk02fgu7.fsf@olgas.newt.com \
--to=wohler@newt.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).