Ross Gardler wrote: > Ross Gardler wrote: > >[This is not directed at anyone in particular, we are all, including me, > >responsible for the oversight of our code base] > > > >The behaviour of the html-to-document.xsl has been changed recently. > >This has already caused problems for a user and now for me. > > > >In short an HTML page has to start with an <h1> again (used to start > >with anything but then insist on correct ordering after that). In > >addition the error message when the document does not conform to the > >proper structure has gone, now it just stops processing. > > > >We need to be more careful not to break existing functionality when > >making changes to our code base. > > I've done some detective work I found where I added this functionality > in (in the locationmap branch [1]), and I found where it was removed > (when the branch was merged [2]). It looks like a bad merge.
Youch. Then we need to look at all the other files involved in that merge: http://svn.apache.org/viewcvs.cgi?diff_format=h&rev=209670&view=rev "svn merge -r190293:head from lm to trunk. That finished the merge of the lm AFAIK." That log message says "finished the merge" so i presume that there was other merging before that. -David > I can't see a commit where it was *intentionally* removed, so I am just > adding it back in [3]. If anyone intentionally changed this code, please > shout out, because I just stomped on your change. There was also another > change lost in the merge, so I replaced that too. > > [1] > http://svn.apache.org/viewcvs.cgi/forrest/trunk/forrestcore/src/core/context/resources/stylesheets/html2document.xsl?rev=56048&r1=55703&r2=56048&diff_format=h > > [2] > http://svn.apache.org/viewcvs.cgi/forrest/trunk/main/webapp/resources/stylesheets/html2document.xsl?rev=209670&r1=153355&r2=209670&diff_format=h > > [3] > http://svn.apache.org/viewcvs.cgi/forrest/trunk/main/webapp/resources/stylesheets/html-to-document.xsl?p1=forrest%2Ftrunk%2Fmain%2Fwebapp%2Fresources%2Fstylesheets%2Fhtml2document.xsl&rev=312541&r1=292937&view=log
