anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around bug #9841

Browse Source 
\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.
This commit is contained in:
Guillaume Munch 2015-12-17 01:04:25 +00:00
parent 2dfb5f80ce
commit dc016de34e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BufferParams.cpp
View File

@ -1275,9 +1275,14 @@ void BufferParams::writeFile(ostream & os, Buffer const * buf) const
} }
os << "\\tracking_changes " << convert<string>(track_changes) << '\n' os << "\\tracking_changes " << convert<string>(track_changes) << '\n'
<< "\\output_changes " << convert<string>(output_changes) << '\n'
<< "\\html_math_output " << html_math_output << '\n' << "\\html_math_output " << html_math_output << '\n'
<< "\\html_css_as_file " << html_css_as_file << '\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'; << "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
if (html_math_img_scale != 1.0) if (html_math_img_scale != 1.0)