From: Glenn Morris <rgm@gnu.org>
To: Ken Brown <kbrown@cornell.edu>
Cc: emacs-devel@gnu.org
Subject: Re: bzr: conflicting tags: mh-e-doc-8.3
Date: Wed, 21 Sep 2011 13:37:08 -0400 [thread overview]
Message-ID: <8ety85er0b.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <4E79F773.8010005@cornell.edu> (Ken Brown's message of "Wed, 21 Sep 2011 10:40:51 -0400")
Ken Brown wrote:
> Conflicting tags:
> mh-e-8.3
>
> after a bzr pull. Can you tell me how to fix that one?
Me too. These mh-e tags seem to be a movable feast.
Now they are attached to r105864:
http://lists.gnu.org/archive/html/emacs-diffs/2011-09/msg00250.html
FWIW, I do not see this issue with a bound, authenticated branch, but I
do see it with an unbound, anonymous branch. It's an annoyance because
you get the conflict message after every subsequent pull, and pull exits
with non-zero status.
Anyway, to fix it I just followed the advice at
http://doc.bazaar.canonical.com/latest/en/user-reference/conflict-types-help.html
If you have no local changes, use
bzr pull --overwrite
once. If you have local changes, you can do:
bzr tags --show-ids -d bzr://bzr.savannah.gnu.org/emacs/trunk | grep mh-e-8.3
Take the revid that returns and use:
bzr tag --force -r 'revid:wohler@newt.com-20110921052217-v8u5kqkpl62l6ilz' \
mh-e-8.3
This makes bzr pull happy, but leaves me with these tags:
mh-e-8.3 105864
mh-e-doc-8.3 105851
when http://lists.gnu.org/archive/html/emacs-diffs/2011-09/msg00250.html
implies they should both be associated with r105864. (The overwrite
method has the same issue.)
next prev parent reply other threads:[~2011-09-21 17:37 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 17:27 bzr: conflicting tags: mh-e-doc-8.3 Glenn Morris
2011-09-20 17:45 ` Eli Zaretskii
2011-09-20 17:57 ` Glenn Morris
2011-09-21 6:32 ` Andreas Röhler
2011-09-21 7:10 ` Eli Zaretskii
2011-09-21 15:23 ` Eli Zaretskii
2011-09-21 14:40 ` Ken Brown
2011-09-21 14:56 ` Eli Zaretskii
2011-09-21 15:05 ` Ken Brown
2011-09-21 15:15 ` Eli Zaretskii
2011-09-22 9:14 ` Andy Moreton
2011-09-22 12:03 ` Eli Zaretskii
2011-09-21 15:37 ` Andreas Schwab
2011-09-21 17:37 ` Glenn Morris [this message]
2011-09-22 17:00 ` Bill Wohler
2011-09-22 17:11 ` Glenn Morris
2011-09-22 18:18 ` Bill Wohler
2011-09-22 18:27 ` Glenn Morris
2011-09-23 9:08 ` Andreas Schwab
2011-09-24 21:02 ` Bill Wohler
2011-09-24 21:09 ` Andreas Schwab
2011-09-24 21:15 ` Bill Wohler
2011-09-24 23:09 ` Andreas Schwab
2011-09-25 0:24 ` Bill Wohler
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8ety85er0b.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kbrown@cornell.edu \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.