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: Fri, 07 Jul 2017 21:46:44 +0000 Message-ID: References: <20170707212353.GA2428@acm> <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="f40304360a0205238e0553c12cec" X-Trace: blaine.gmane.org 1499464070 22080 195.159.176.226 (7 Jul 2017 21:47:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Jul 2017 21:47:50 +0000 (UTC) Cc: Emacs developers To: Paul Eggert , Alan Mackenzie , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 23:47:46 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 1dTb6B-0004wE-Mg for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 23:47:39 +0200 Original-Received: from localhost ([::1]:58937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTb6C-00066E-CF for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 17:47:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTb5Y-00065v-1n for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:47:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTb5X-0004FN-5r for emacs-devel@gnu.org; Fri, 07 Jul 2017 17:47:00 -0400 Original-Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]:33518) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTb5V-0004D3-D2; Fri, 07 Jul 2017 17:46:57 -0400 Original-Received: by mail-lf0-x230.google.com with SMTP id z78so32349087lff.0; Fri, 07 Jul 2017 14:46:57 -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=RqBvBDfgK/4MXpPWhK6Uvy5Zhkq438Y4mrmv+QW79oQ=; b=G75ui/4mjcjXn5RBmVNGYyKQhynxBsj1/FZ22t9D5MivR8iBHdgIfCwfI8jU7fyuHW 69NEETdouhHBJnXcFUNeOS6UzM473BeEg2o5UJOkArfGtyXQKHxtRrUM6mvENkS0GrfG wWmGrVc+Fvxdbw8GZoNdSSc63TD3eIBKQTsw3zR/ZThTQ0iXdQnxJ4ssK6A7RqZiHbuA qUn3Es7USctXd/Ko7sqcj/Gsp8pHgtqdACySG7Gb064LDdKBxIwFQqsuGiLb8Zc7MIop B2YfOrb1PdIHpESZ8Fg1fTKhJTUgi+6wpl12ueZAOvW5LuZ0osIeuWqQjMMHyvj4WDaK ojfQ== 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=RqBvBDfgK/4MXpPWhK6Uvy5Zhkq438Y4mrmv+QW79oQ=; b=rXH9MbqhYEAH/nk82W2CWNPVtTGHf4DAXsiBXQOnG12YlMWAUNU+vxvAxJpN2K+GS3 Itp6s0yDHSXXfSHEvJeixQgxWkal/O51KOwUZ5JsXYJBisYl7aJy+ichSvY45UuWcNm5 JgFL7InPZRC7H5quArX4ijK0uNe0r+0HbGeJE4G42kC4GPFg4GsCsnXtI38PZoD2aY8h LjKW3anFix9YN4qzZTvfAUkcagBG3ZwbkjyzXSyvYnQOImQ6zlL2HLDvRSSkp5BjNpUT 9Ol8f+Pgx2tJetmoV2JfeCM0flwU1V8ca8K6K+IMz+pNKDfowshRF/KHog3K59TpklU6 uF/g== X-Gm-Message-State: AKS2vOwAUirFtjzBA0VyTQG+67YRI21jqMjeLE4RKC7XvEdnDbOak02+ dY4than+aotHoeSvKPjN/+Om1LkCqQ== X-Received: by 10.25.221.206 with SMTP id w75mr19793774lfi.5.1499464015879; Fri, 07 Jul 2017 14:46:55 -0700 (PDT) In-Reply-To: <95b91e6b-c53e-c969-cda1-998803d301cc@cs.ucla.edu> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::230 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:216294 Archived-At: --f40304360a0205238e0553c12cec Content-Type: text/plain; charset="UTF-8" On Fri, Jul 7, 2017 at 5:41 PM Paul Eggert wrote: > Presumably the lines in question were changed in one branch or the other > (not > necessarily by messing with white space), and our git settings are > suggesting > that you omit the spaces before tabs while you're futzing with those lines. > > As build-aux/git-hooks/pre-commit suggests, you can work around the problem > temporarily with the shell command 'git config core.whitespace > -trailing-space'. > I don't recommend this setting in general, though. > I found the error useful. So when line-numbers branch is eventually merged, instead of ignoring/bypassing this error, I'd suggest that that tab+space+tab combo be fixed and that whole thing be made to contain only tabs or only spaces (my preference). Slowly and gradually, as more merges and commits happen in future, all such mixtures of tabs+spaces will get removed. -- Kaushal Modi --f40304360a0205238e0553c12cec Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Jul 7,= 2017 at 5:41 PM Paul Eggert <egge= rt@cs.ucla.edu> wrote:
Presu= mably the lines in question were changed in one branch or the other (not necessarily by messing with white space), and our git settings are suggesti= ng
that you omit the spaces before tabs while you're futzing with those li= nes.

As build-aux/git-hooks/pre-commit suggests, you can work around the problem=
temporarily with the shell command 'git config core.whitespace -trailin= g-space'.
I don't recommend this setting in general, though.

I found the error useful. So when line-numbers branch is ev= entually merged, instead of ignoring/bypassing this error, I'd suggest = that that tab+space+tab combo be fixed and that whole thing be made to cont= ain only tabs or only spaces (my preference).=C2=A0

Slowly and gradually, as more merges and commits happen in future, all su= ch mixtures of tabs+spaces will get removed.
--

Kaushal Modi

--f40304360a0205238e0553c12cec--