GNU bug report logs - #14077
building with conflicts

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 14077 in the body.
You can then email your comments to 14077 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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 #10 received at 14077-done <at> debbugs.gnu.org (full text, mbox):

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.