From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Sat, 08 Jul 2017 12:46:07 +0000 Message-ID: References: <20170707212353.GA2428@acm> <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> <83inj3l5gi.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a114b15926aa8750553cdbcad" X-Trace: blaine.gmane.org 1499518055 21462 195.159.176.226 (8 Jul 2017 12:47:35 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 8 Jul 2017 12:47:35 +0000 (UTC) Cc: Alan Mackenzie , Paul Eggert , Emacs developers To: Noam Postavsky , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jul 08 14:47:31 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTp8y-00059b-0B for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 14:47:28 +0200 Original-Received: from localhost ([::1]:32834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTp93-00036Q-Ag for ged-emacs-devel@m.gmane.org; Sat, 08 Jul 2017 08:47:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTp8u-00036J-Bw for emacs-devel@gnu.org; Sat, 08 Jul 2017 08:47:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTp8t-00052t-FN for emacs-devel@gnu.org; Sat, 08 Jul 2017 08:47:24 -0400 Original-Received: from mail-lf0-f46.google.com ([209.85.215.46]:34323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTp8p-00052I-LX; Sat, 08 Jul 2017 08:47:19 -0400 Original-Received: by mail-lf0-f46.google.com with SMTP id t72so37898081lff.1; Sat, 08 Jul 2017 05:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=jcbfz6uOxgTVbwulnOOibFBDpu8Vc1bDgw2DFRC1MFM=; b=jt44/GDHPhRZHPqjIt18ssKMOYIB/0GNgumlw1Ngn4cH/OpH6n/7ta8KKC5aPiaaPj FRXwWS8n8PxkKSsyPxAbRrJwAnR4AEGKx5NAXyjOGBitADABB1ziu9N67hXGQDUl9Iaj yci5MPqydd3yCqk5b9c9pVJuc+ag9vWGuOqB7L2YJMw32nnrYlU+NJTdcz/av7ssf5YS 2E2Tr/77yn0kXebtjqOKkHRA7TNsQDIkcON2dV9RfxWXzlHxvMv+3L2QnbHzjt5fc+kq n1c0gN5Lrhe1aWQmrvOIRvfYlhi3NUQOR2mQ8GK3dCp4gi1SqEYJkMpByw01FWZefeJe lXgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jcbfz6uOxgTVbwulnOOibFBDpu8Vc1bDgw2DFRC1MFM=; b=HbkAsW+kxw4lDqKLFYzzz9mXsKNeZkBgq3tWvt+oqf5B9x7KhcivI9cLaoqz87kEQD +Gh1JsWz0DMOkEBVrkUn2tKIVJ+JgeAaNuwO5jUZssra5P8/0BuqV8FANKHSGdkOESUx OcceDFXm0cOVRXnqOerBJGP/Pk9vX6q0V5U97pUNrhi+8EhHLfX2wSjHgLXpbnAEgjrk 40w4QFHIwKX3MG4wJh4oR3IOCo6+jMZMxIZjpLd3DpS6+PiNfR+IqC5NKA121NPLsYfw K7TiRMsao1/bsKmirWWrh0AQminyNwGk/GHtAQfIUsFk/L5r26eqPxx4lrhwyrpkyeCH r58g== X-Gm-Message-State: AIVw1117xUlnBUcww92zPDe+YL+wX3HHKt3vX/YqenleTQqHBcHf0xhq xITEoc3NiG9btjsFzt+UKG7TlzI+eg== X-Received: by 10.46.69.212 with SMTP id s203mr1693748lja.73.1499517978059; Sat, 08 Jul 2017 05:46:18 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.215.46 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:216322 Archived-At: --001a114b15926aa8750553cdbcad Content-Type: text/plain; charset="UTF-8" On Sat, Jul 8, 2017, 8:05 AM Noam Postavsky wrote: > > The latter confusing condition is why the hook was changed to only > check the newly merged in changes, but you need to run './autogen git' > to update it in your local copy (I assume Kaushal had not done so, > hence the error). > I do run "./autogen.sh all" but only when the configure file is not present (doing this via a wrapper script). So I definitely must have run that before your earlier referenced commit [1]. I think I should instead run "./autogen.sh git" too during each build now. I believe git only complains about tab following spaces, not spaces > following tabs. > Yes, this one is a weird case where spaces were trapped between 2 tabs. > [1]: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678 Allow bypassing of some checks when merging -- Kaushal Modi --001a114b15926aa8750553cdbcad Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Sat, Jul 8, 2017, 8:05 AM No= am Postavsky <npostavs@users.sourceforge.net> wrote:

The latter confusing condition is why the hook was changed to only
check the newly merged in changes, but you need to run './autogen git&#= 39;
to update it in your local copy (I assume Kaushal had not done so,
hence the error).

I do run "= ./autogen.sh all" but only when the configure file is not present (doi= ng this via a wrapper script). So I definitely must have run that before yo= ur earlier referenced commit [1]. I think I should instead run=C2=A0".= /autogen.sh git" too during each build now.=C2=A0

=
I believe git onl= y complains about tab following spaces, not spaces
following tabs.

Yes, this one is = a weird case where spaces were trapped between 2 tabs.=C2=A0
[1]: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c= 67227f678

Allow bypassing of some checks when merging

--

Kaushal Modi

--001a114b15926aa8750553cdbcad--