* How to resolve: Conflicting tags: mh-e-8.4
@ 2013-01-14 15:54 Leo Liu
2013-01-14 17:05 ` Glenn Morris
0 siblings, 1 reply; 5+ messages in thread
From: Leo Liu @ 2013-01-14 15:54 UTC (permalink / raw)
To: emacs-devel
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.
Leo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: How to resolve: Conflicting tags: mh-e-8.4
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
0 siblings, 2 replies; 5+ messages in thread
From: Glenn Morris @ 2013-01-14 17:05 UTC (permalink / raw)
To: Leo Liu; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: How to resolve: Conflicting tags: mh-e-8.4
2013-01-14 17:05 ` Glenn Morris
@ 2013-01-14 17:09 ` Leo Liu
2013-01-21 19:58 ` Bill Wohler
1 sibling, 0 replies; 5+ messages in thread
From: Leo Liu @ 2013-01-14 17:09 UTC (permalink / raw)
To: emacs-devel
On 2013-01-15 01:05 +0800, Glenn Morris wrote:
> 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
Thanks.
Leo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: How to resolve: Conflicting tags: mh-e-8.4
2013-01-14 17:05 ` Glenn Morris
2013-01-14 17:09 ` Leo Liu
@ 2013-01-21 19:58 ` Bill Wohler
2013-01-22 3:06 ` Glenn Morris
1 sibling, 1 reply; 5+ messages in thread
From: Bill Wohler @ 2013-01-21 19:58 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: How to resolve: Conflicting tags: mh-e-8.4
2013-01-21 19:58 ` Bill Wohler
@ 2013-01-22 3:06 ` Glenn Morris
0 siblings, 0 replies; 5+ messages in thread
From: Glenn Morris @ 2013-01-22 3:06 UTC (permalink / raw)
To: Bill Wohler; +Cc: emacs-devel
Bill Wohler wrote:
> 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.
It's not really that much trouble. I don't think it makes a difference
whether you use a bound or unbound branch for your tagging. Whether the
person at the other end has a bound or unbound branch affects whether or
not they see the issue, is all (I think).
IIUC, the issue can arise only if you move a tag. Ie, tag one revision,
then later on tag another revision with the same tag. It's an inevitable
consequence of bzr not having versioned tags. If you need to move a tag,
just move it and don't worry about it though.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-01-22 3:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2013-01-22 3:06 ` Glenn Morris
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).