From: Glenn Morris <rgm@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Chong Yidong <cyd@gnu.org>, emacs-devel@gnu.org
Subject: Re: emacs-24 goof causes bzr log error: "Invalid line in bugs property"
Date: Sat, 29 Dec 2012 03:17:20 -0500 [thread overview]
Message-ID: <g2fw2puvan.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <83wqw1l3yl.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 29 Dec 2012 09:20:18 +0200")
I think it is fixed now.
***NB: If you have local changes to your copy of the emacs-24 branch,
please make a backup of them before doing anything else***
If you have a bound branch, `bzr update' may result in some or all of
the now uncommitted changes showing up as a pending merge. Please just
bzr revert them away, then you should be back to normal.
If you have an unbound branch, `bzr pull' will complain about diverged
branches. Use `bzr pull --overwrite'. (This is why you should backup
local changes first.)
This has been fun.
next prev parent reply other threads:[~2012-12-29 8:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-28 3:48 emacs-24 goof causes bzr log error: "Invalid line in bugs property" Glenn Morris
2012-12-28 19:38 ` Glenn Morris
2012-12-28 19:56 ` Eli Zaretskii
2012-12-29 0:30 ` Glenn Morris
2012-12-29 5:50 ` Chong Yidong
2012-12-29 7:20 ` Eli Zaretskii
2012-12-29 8:17 ` Glenn Morris [this message]
2012-12-29 8:36 ` Eli Zaretskii
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=g2fw2puvan.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=cyd@gnu.org \
--cc=eliz@gnu.org \
--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).