From dc016de34eab3fe24d9673a48cabf754bebbadaa Mon Sep 17 00:00:00 2001 From: Guillaume Munch Date: Thu, 17 Dec 2015 01:04:25 +0000 Subject: [PATCH] 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. --- src/BufferParams.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index ee9f535f99..a5c3bfa2fc 100644 --- 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(track_changes) << '\n' - << "\\output_changes " << convert(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(output_changes) << '\n' << "\\html_be_strict " << convert(html_be_strict) << '\n'; if (html_math_img_scale != 1.0)