Stefan Seefeld wrote:
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
C stefan libs/python/doc/tutorial/doc/html/index.html C stefan libs/python/doc/tutorial/doc/html/python/embedding.html C stefan libs/python/doc/tutorial/doc/html/python/exposing.html C stefan libs/python/doc/tutorial/doc/html/python/functions.html C stefan libs/python/doc/tutorial/doc/html/python/hello.html C stefan libs/python/doc/tutorial/doc/html/python/object.html C stefan libs/python/doc/tutorial/doc/html/python/techniques.html
These files are all auto-generated from the quickbook tutorial.qbk file. As the latter hasn't changed, all these conflicts stem from changes to the html-generator tool(s). IMO this is just another proof that storing auto-generated files in the repository is a bad idea.
(What's the correct thing to do here ? Ignore the changes ?)
Yes. I'll remove them from the offline list I'm keeping. Thanks, --Beman