On Mon, Aug 08, 2016 at 12:40:29PM -0400, Richard Heck wrote: > > All right, so I ran "make updatetests", and I see a whole ton of errors > about layouts. But the diff that is produced is presumably all right, > since there are no branches to do anything with:
From what I understand, this is expected. > All I see is the change > of format. Except in one case, where we have: > > diff --git a/src/tex2lyx/test/test-structure.lyx.lyx > b/src/tex2lyx/test/test-structure.lyx.lyx > index d8bc008..2a77a8e 100644 > --- a/src/tex2lyx/test/test-structure.lyx.lyx > +++ b/src/tex2lyx/test/test-structure.lyx.lyx > @@ -1,5 +1,5 @@ > #LyX file created by tex2lyx 2.3 > -\lyxformat 510 > +\lyxformat 512 > \begin_document > \begin_header > \save_transient_properties true > @@ -213,7 +213,7 @@ This causes the > \begin_inset Flex Flex:Strong > status collapsed > > -\begin_layout Standard > +\begin_layout Plain Layout > logikalmkup > \end_layout > > This is how it should be, and is due to some pre-2.2 change in how > character styles are handled: By default, they force the plain layout. > (We did not do a format change for that.) But I do not know if comitting > that will cause other problems. Ah yes this is due to your fix at 15281757. I think the test associated with test-structure was failing before the format change commit, because of 15281757. I propose you commit the updated references now that you've confirmed the diff looks correct. And then if Georg has time he can make sure that we did not make a mistake in how we proceeded. Thanks for taking the time to fix the tests. Scott
signature.asc
Description: PGP signature
