From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Ecay Subject: Re: New patches WAS Re: [PATCH] inline src block results can be removed Date: Sat, 24 Jan 2015 20:14:53 -0500 Message-ID: <87a917hd9u.fsf@gmail.com> References: <87egt81acy.fsf@gmail.com> <8761ejq9ek.fsf@nicolasgoaziou.fr> <87sihltt3v.fsf@selenimh.mobile.lan> <87zjbqrapy.fsf@nicolasgoaziou.fr> <87lhl2s5zc.fsf@nicolasgoaziou.fr> <87oapuac7g.fsf@nicolasgoaziou.fr> <87egqpxc6o.fsf@nicolasgoaziou.fr> <87a91a76sm.fsf@selenimh.mobile.lan> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFBn2-0001UB-Sj for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 20:15:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFBmz-0003aI-Md for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 20:15:00 -0500 Received: from mail-qa0-x22c.google.com ([2607:f8b0:400d:c00::22c]:36267) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFBmz-0003aE-Hz for emacs-orgmode@gnu.org; Sat, 24 Jan 2015 20:14:57 -0500 Received: by mail-qa0-f44.google.com with SMTP id w8so2845684qac.3 for ; Sat, 24 Jan 2015 17:14:56 -0800 (PST) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "Charles C. Berry" Cc: emacs-orgmode@gnu.org Hi Chuck, 2015ko urtarrilak 24an, "Charles C. Berry"-ek idatzi zuen: > All tests passed (modulo a few shell and fortran issues unique to my setu= p=20 > which also failed for master). >=20 > Then I did an update and `git merge master' and got a pile of errors due = to >=20 > commit fda70440f49292197d76ce4c2727dbf426bc65f3 > Author: Aaron Ecay > Date: Thu Jan 22 00:59:04 2015 -0500 >=20 > which explicitly tests for conformity to the old inline regime or > at least depends on it. By =E2=80=9Cpile of errors=E2=80=9D do you mean test failures or merge conf= licts? AFAICS the patches you sent to the list did not touch the test suite, so there should not be merge conflicts. But maybe you had a patch for the tests that you didn=E2=80=99t send. (If I somehow caused merge conflicts f= or your patches, I would offer to help fix them.) The test suite depends on the specific way in which inline results are inserted, so it will need to be updated to take account of your change. The commit you referenced doesn=E2=80=99t fundamentally alter that dependency, though it does remove what used to be a requirement that =E2=80=98org-babel-inline-results-wrap=E2=80=99 be set to its default value. Thanks, --=20 Aaron Ecay