Work around bug #9841

\output_changes is now output at a distance from \tracking_changes.

Since both parameters can be seen as per-user preferences, they can cause
undesirable merge conflicts, in a multi-author setting, were it treated as a
single block by the version control system, as was the case before this patch.

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index ee9f535f9978fe7906bf1b3c39240855535601da..a5c3bfa2fc93f1ae2a0843d2e5fc08aaaa8e9508 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1275,9 +1275,14 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
        }
 
        os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
-          << "\\output_changes " << convert<string>(output_changes) << '\n'
           << "\\html_math_output " << html_math_output << '\n'
           << "\\html_css_as_file " << html_css_as_file << '\n'
+               // \output_changes is output at a distance from \tracking changes as a
+               // workaround to bug #9841: both parameters can be seen as per-user
+               // preferences and therefore can cause undesirable merge conflicts, in a
+               // multi-author setting, if it were treated as a single block by the
+               // version control system.
+          << "\\output_changes " << convert<string>(output_changes) << '\n'
           << "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
 
        if (html_math_img_scale != 1.0)