From: Glenn Morris <rgm@gnu.org>
To: john ffitch <jpff@codemist.co.uk>
Cc: 6428@debbugs.gnu.org
Subject: bug#6428: 24.0.50; UNEXEC.OBJ not defined
Date: Wed, 16 Jun 2010 11:58:14 -0400 [thread overview]
Message-ID: <6aaaqvotpl.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <2727-Wed16Jun2010124133+0100-jpff@codemist.co.uk> (john ffitch's message of "Wed\, 16 Jun 2010 12\:41\:33 +0100")
john ffitch wrote:
> ~/GNU_21/emacs/trunk> bzr status
> renamed:
> configure => configure.OTHER*
> modified:
> configure.OTHER*
> unknown:
> configure
> configure.BASE
> configure.BASE.moved
> configure.BASE.moved.moved
> configure.BASE.moved.moved.moved
> configure.OTHER.moved
> configure.OTHER.moved.moved
> configure.OTHER.moved.moved.moved
> configure.THIS
> configure.THIS.moved
> configure.THIS.moved.moved
> conflicts:
> Contents conflict in configure
Clearly you have massive, multiple conflicts in configure, so it has
not been updating properly. You should do something like:
rm configure*
bzr revert configure configure.in
(assuming you have no local changes to configure.in) and re-run
bzr status
to check. Then
make maintainer-clean
and run `configure' again.
If you run `autoconf', you are likely to run into conflicts with
configure, which you need to pay attention to.
prev parent reply other threads:[~2010-06-16 15:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-15 7:43 bug#6428: 24.0.50; UNEXEC.OBJ not defined john ffitch
2010-06-15 19:43 ` Glenn Morris
2010-06-16 11:41 ` john ffitch
2010-06-16 15:58 ` Glenn Morris [this message]
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=6aaaqvotpl.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=6428@debbugs.gnu.org \
--cc=jpff@codemist.co.uk \
/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.