Hi Chuck, 2015ko urtarrilak 24an, "Charles C. Berry"-ek idatzi zuen: > All tests passed (modulo a few shell and fortran issues unique to my setup > which also failed for master). > > Then I did an update and `git merge master' and got a pile of errors due to > > commit fda70440f49292197d76ce4c2727dbf426bc65f3 > Author: Aaron Ecay <aarone...@gmail.com> > Date: Thu Jan 22 00:59:04 2015 -0500 > > which explicitly tests for conformity to the old inline regime or > at least depends on it.
By “pile of errors” do you mean test failures or merge conflicts? 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’t send. (If I somehow caused merge conflicts for 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’t fundamentally alter that dependency, though it does remove what used to be a requirement that ‘org-babel-inline-results-wrap’ be set to its default value. Thanks, -- Aaron Ecay
