From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#14077: building with conflicts Date: Fri, 29 Mar 2013 20:57:50 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1364605108 679 80.91.229.3 (30 Mar 2013 00:58:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 30 Mar 2013 00:58:28 +0000 (UTC) To: 14077-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Mar 30 01:58:55 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ULk8D-00058c-Mr for geb-bug-gnu-emacs@m.gmane.org; Sat, 30 Mar 2013 01:58:53 +0100 Original-Received: from localhost ([::1]:50392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULk7p-00025r-IY for geb-bug-gnu-emacs@m.gmane.org; Fri, 29 Mar 2013 20:58:29 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:58377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULk7l-00025l-ED for bug-gnu-emacs@gnu.org; Fri, 29 Mar 2013 20:58:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULk7j-0005Xw-P1 for bug-gnu-emacs@gnu.org; Fri, 29 Mar 2013 20:58:25 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:47563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULk7j-0005Xq-LZ for bug-gnu-emacs@gnu.org; Fri, 29 Mar 2013 20:58:23 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1ULkAH-00007v-TG for bug-gnu-emacs@gnu.org; Fri, 29 Mar 2013 21:01:01 -0400 Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 30 Mar 2013 01:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 14077 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: wontfix Mail-Followup-To: 14077@debbugs.gnu.org, rgm@gnu.org, holtzermann17@gmail.com Original-Received: via spool by 14077-done@debbugs.gnu.org id=D14077.136460523332403 (code D ref 14077); Sat, 30 Mar 2013 01:01:01 +0000 Original-Received: (at 14077-done) by debbugs.gnu.org; 30 Mar 2013 01:00:33 +0000 Original-Received: from localhost ([127.0.0.1]:51671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULk9m-0008OF-Oo for submit@debbugs.gnu.org; Fri, 29 Mar 2013 21:00:32 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:40618) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULk9l-0008MF-4p for 14077-done@debbugs.gnu.org; Fri, 29 Mar 2013 21:00:29 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1ULk7C-0007eP-6r; Fri, 29 Mar 2013 20:57:50 -0400 X-Spook: undercover import AMW Juiliett Class Submarine Ceridian X-Ran: W,OR3(tzO>|/ahwJ~dO8BI82tP6K~<'H (Joe Corneli's message of "Thu, 28 Mar 2013 20:28:52 +0100") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:72985 Archived-At: 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.