GNU bug report logs - #14077
building with conflicts

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Glenn Morris <rgm <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#14077: closed (building with conflicts)
Date: Sat, 30 Mar 2013 01:01:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Fri, 29 Mar 2013 20:57:50 -0400
with message-id <aowqspaelt.fsf <at> fencepost.gnu.org>
and subject line Re: bug#14077: building with conflicts
has caused the debbugs.gnu.org bug report #14077,
regarding building with conflicts
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
14077: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14077
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Joe Corneli <holtzermann17 <at> gmail.com>
To: bug-gnu-emacs <at> gnu.org
Subject: building with conflicts
Date: Thu, 28 Mar 2013 20:28:52 +0100

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.

[Message part 3 (message/rfc822, inline)]

From: Glenn Morris <rgm <at> gnu.org>
To: 14077-done <at> debbugs.gnu.org
Subject: Re: bug#14077: building with conflicts
Date: Fri, 29 Mar 2013 20:57:50 -0400

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.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.