From: Glenn Morris <rgm@gnu.org>
To: 14077-done@debbugs.gnu.org
Subject: bug#14077: building with conflicts
Date: Fri, 29 Mar 2013 20:57:50 -0400 [thread overview]
Message-ID: <aowqspaelt.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <CAN+qofnheT-k4NjAa1hUjsCeM-cQUjJ5h8zQ83shcCjvoc6-BQ@mail.gmail.com> (Joe Corneli's message of "Thu, 28 Mar 2013 20:28:52 +0100")
Joe Corneli wrote:
> Symbol's value as variable is void: <<<<<<<
> make[2]: *** [bootstrap-emacs] Error 1
> make[1]: *** [src] Error 2
> make: *** [bootstrap] Error 2
>
> Upon further investigation there were unmerged conflicts in
> buff-menu.el (not sure how they got there) - but it would be great to
> get a warning in advance about unmerged conflicts before make
> bootstrap.
The warning is found in the output of `bzr pull' (or whatever command
you use), you just need to look for it.
Such problems should be rare, and easy to diagnose, so I see no point
in adding special handling for this to the Emacs build process.
prev parent reply other threads:[~2013-03-30 0:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-28 19:28 bug#14077: building with conflicts Joe Corneli
2013-03-30 0:57 ` 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=aowqspaelt.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=14077-done@debbugs.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 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.