From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Petton Newsgroups: gmane.emacs.bugs Subject: bug#22506: make change-history now doesn't work at all Date: Sun, 31 Jan 2016 22:47:53 +0100 Message-ID: <87k2mppgja.fsf@petton.fr> References: <56AE745A.1090402@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1454276900 26572 80.91.229.3 (31 Jan 2016 21:48:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Jan 2016 21:48:20 +0000 (UTC) To: Paul Eggert , Glenn Morris , 22506@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 31 22:48:08 2016 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 1aPzqq-0003yR-9a for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 22:48:08 +0100 Original-Received: from localhost ([::1]:43396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzqp-0000i5-OJ for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 16:48:07 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzql-0000hn-Ny for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:48:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPzqk-0006PU-Mu for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:48:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzqk-0006PP-JI for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:48:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aPzqk-0007KE-8z for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:48:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Nicolas Petton Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Jan 2016 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22506 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22506-submit@debbugs.gnu.org id=B22506.145427687728147 (code B ref 22506); Sun, 31 Jan 2016 21:48:02 +0000 Original-Received: (at 22506) by debbugs.gnu.org; 31 Jan 2016 21:47:57 +0000 Original-Received: from localhost ([127.0.0.1]:43500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPzqe-0007Ju-RR for submit@debbugs.gnu.org; Sun, 31 Jan 2016 16:47:56 -0500 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35512) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPzqd-0007Jn-Lo for 22506@debbugs.gnu.org; Sun, 31 Jan 2016 16:47:55 -0500 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 50E682C34F for <22506@debbugs.gnu.org>; Sun, 31 Jan 2016 16:47:55 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute3.internal (MEProxy); Sun, 31 Jan 2016 16:47:55 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=v2824UX7hCaKPOzv0E2Gr8KAsQ8=; b=IkT3o WfrWPVz6wiFNnH4F3enQzkZa91vTR+4HkGFmRq2CU3PygXHVGjWg6fl5rIYpgGQp gdQE7ADUy1VuEZ8gZpUgSwUrrHOWHxf/zY55dQJhQAjY5qpKxw4NoHZ7+0f7E20P p+275YvAkdeqvV6cHETrPLOTLgQT6b/DdtKHaU= X-Sasl-enc: wVYFSLiQXdeKSjZ72DyIdAsJ2zbp/kudCEqdQuSQ5YGX 1454276874 Original-Received: from blueberry (arennes-658-1-237-39.w2-13.abo.wanadoo.fr [2.13.182.39]) by mail.messagingengine.com (Postfix) with ESMTPA id 9496F68019E; Sun, 31 Jan 2016 16:47:54 -0500 (EST) In-Reply-To: <56AE745A.1090402@cs.ucla.edu> User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/25.1.50.3 (x86_64-unknown-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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:112163 Archived-At: --=-=-= Content-Type: text/plain Paul Eggert writes: > My guess is that Nicolas ran 'make change-history' on a private branch > and then merged the result into emacs-25. This has never worked, and > it's why Makefile.in tries to check for this sort of thing. No, I changed the branch check on emacs-25 to check for emacs-25 instead of master, and then ran make change-history-nocommit. This worked without any problem. Nico --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: GPGTools - http://gpgtools.org iQEcBAEBCAAGBQJWroEJAAoJECM1h6R8IHkQubsH/RdWRxrtMCN7RwC4GFY8HOIQ 6Ywnq30rOLE4eqsdnroka9CH7sderL+f5f2R+0E+U+/nAGT1ZH38ZnT+rudQJ8Q5 paQrIfIJfqCxZpYpeNXRjPx8xfxw84M5mR70d9kvlAKdYNyeHrIbQj36llKbQ7oi x6sG9Zy8wVrIxsOXNsGXJtJp7MJpapGwiRKrQB1tCJxm+DOL2f/oes/GTAg7q7C5 qkOd8+apzNAQRwhEcQMu3imN3S6hASO0Mpjo7kA9H3CfhO2/uPA5jkW2YYf78Y83 TAFx0kEypy/xDKcaFODKzlvLN3iXykAjO6nKkHJlZ43nkMuIU6lvYGC3QbLEQqo= =Mesp -----END PGP SIGNATURE----- --=-=-=--