From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 28 15:31:29 2013 Received: (at submit) by debbugs.gnu.org; 28 Mar 2013 19:31:29 +0000 Received: from localhost ([127.0.0.1]:49927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULIXp-00073C-EM for submit@debbugs.gnu.org; Thu, 28 Mar 2013 15:31:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43345) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1ULIXo-000735-30 for submit@debbugs.gnu.org; Thu, 28 Mar 2013 15:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULIVL-0006XZ-41 for submit@debbugs.gnu.org; Thu, 28 Mar 2013 15:28:56 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-102.3 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, USER_IN_WHITELIST autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:38830) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULIVL-0006XS-1z for submit@debbugs.gnu.org; Thu, 28 Mar 2013 15:28:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULIVK-00014m-26 for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 15:28:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULIVJ-0006WD-Be for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 15:28:53 -0400 Received: from mail-vc0-f170.google.com ([209.85.220.170]:52039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULIVJ-0006W1-8G for bug-gnu-emacs@gnu.org; Thu, 28 Mar 2013 15:28:53 -0400 Received: by mail-vc0-f170.google.com with SMTP id lf10so8073421vcb.15 for ; Thu, 28 Mar 2013 12:28:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to :content-type; bh=91qjW+7Q6FJRxdBbHZ2pq/hGwGMbvL6nSV/+Vsnw+HY=; b=aMmZPFK49aLBFVUvz2lb6JHumvSlIF93wzS01K09TBuli/OiBChrqBXCopWF2DNydQ g7cCSekRcCauRUzs6ILOIMzb50xgYYHMsa/I0T0Z0QPCiwIFSv9DgFqwX0ZFv7XtvS/5 qC2bwcXc8Qb1XLACiuzAzdeaZ5FiClaLQfxs5w049Hiy3ToFS1TUdVGDB+YQIfY8p55z FELHPZ53wWYzcITHxQ6bYYiPjDZShICFxOoGmg4TVtZvza/EEowSaBXZx0R4Jx8c835v Ess1goNr3Cftng8bLCcP90F71ARqDIZvh6XpkQctokOhhvTe5GQP/npY6IG94nWlZcpy +JTQ== MIME-Version: 1.0 X-Received: by 10.220.108.69 with SMTP id e5mr28302121vcp.47.1364498932575; Thu, 28 Mar 2013 12:28:52 -0700 (PDT) Received: by 10.58.0.83 with HTTP; Thu, 28 Mar 2013 12:28:52 -0700 (PDT) Date: Thu, 28 Mar 2013 20:28:52 +0100 Message-ID: Subject: building with conflicts From: Joe Corneli To: bug-gnu-emacs@gnu.org Content-Type: text/plain; charset=ISO-8859-1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -3.2 (---) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -3.2 (---) 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. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 29 21:00:32 2013 Received: (at 14077-done) by debbugs.gnu.org; 30 Mar 2013 01:00:33 +0000 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 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 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 From: Glenn Morris To: 14077-done@debbugs.gnu.org Subject: Re: bug#14077: building with conflicts References: 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") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.5 (-----) X-Debbugs-Envelope-To: 14077-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.3 (------) 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. From unknown Sun Jun 22 11:37:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 27 Apr 2013 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator