From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Fri, 7 Jul 2017 11:51:51 -0400 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1499442726 19428 195.159.176.226 (7 Jul 2017 15:52:06 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Jul 2017 15:52:06 +0000 (UTC) Cc: Emacs developers To: Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 17:52:01 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 1dTVY1-0004kW-03 for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 17:52:01 +0200 Original-Received: from localhost ([::1]:57228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVY6-0005pY-F4 for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 11:52:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTVXt-0005nN-NI for emacs-devel@gnu.org; Fri, 07 Jul 2017 11:51:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTVXs-0004Lj-Us for emacs-devel@gnu.org; Fri, 07 Jul 2017 11:51:53 -0400 Original-Received: from mail-oi0-x22d.google.com ([2607:f8b0:4003:c06::22d]:34897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTVXs-0004LH-Ou for emacs-devel@gnu.org; Fri, 07 Jul 2017 11:51:52 -0400 Original-Received: by mail-oi0-x22d.google.com with SMTP id 191so30939330oii.2 for ; Fri, 07 Jul 2017 08:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=tDlf9qZPyFy6zrrefP+d+gMf3U1cYlRiLYqLD/0SsBU=; b=W4lCtPVpg0qPYBj/wDYMjrL5qywEfnL9PfKRSSWphT3ekwJ6Jlw6FSB5AR+/63uCYp hKXW3wN+xTuhbKIiqjGIAymLUM5x9c4UrzD5llZbEGKRrW83utpP1OAO/Rl7RfRDtMXN 3NU4pBp1FqXsTnTpbtM8mXU9anDeZG052vY3xx7tEbIOICWbUDvabony/FkUfJwRK7TP Mp5x1jFmt5aP9Xb2vzPfi01mtT++07EpOAAjGEjnBmp2tQam4SM4i8zfINzxterVBzrZ gsKZGOctjRcIrzf+MwcOFdXvgi+Fp679oNimBDrCCoVThPBBzMvnrtxjGlEY3oyFK4Hy byLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=tDlf9qZPyFy6zrrefP+d+gMf3U1cYlRiLYqLD/0SsBU=; b=DM2SL1a3VeOlQhodq+l7CyUKr+JiaDp1YVP+o0/VdN9/bhhQcWkHA+1156v8Yh/Klq P1FF+3KC6WmYOi9F2xFTU1Ai+i+xADbwN1+9vA+O2ROcYVsrzJjtOGC9bFhk1mNEu5Rv me6aatQvEDau+MGnv84JeKT4lxWC914mJL1wQHmf7cVsRkeZgekDj3MtCyQA/vPnNRT3 55ixdMeHXmHGa4T/rqjMskjLsGA0Dw5rr6J2sCaP12nQLtPdz0g093bbOrmasfqepi6n m5K+Aa8xifXSkub6NkOE8SgeBxA9liGCu7T47uyRwR/67ClkleRmKBvhCTQenmse0Lq7 LKlQ== X-Gm-Message-State: AIVw111kT/aHxyIyZE7QP7CnV9NOPSmCsK33dr5WIKLQzdcgTQzRQSiA SOIpI93pRcKMGCF5EburCcwoM6JkUA== X-Received: by 10.202.106.79 with SMTP id f76mr1124020oic.16.1499442712021; Fri, 07 Jul 2017 08:51:52 -0700 (PDT) Original-Received: by 10.74.113.91 with HTTP; Fri, 7 Jul 2017 08:51:51 -0700 (PDT) In-Reply-To: X-Google-Sender-Auth: MAOfybiDpg2MYyJGBUVjLHIek0k X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22d 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:216278 Archived-At: On Fri, Jul 7, 2017 at 11:43 AM, Kaushal Modi wrote: > Also, shouldn't that commit have been blocked in the first place instead of complaining about it when merging? If you rerun './autogen git' in a checkout which includes [1: e20ad44], the git hook should be updated such that it won't complain about changes from merged commits anymore. 1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678 Allow bypassing of some checks when merging