Issue 33371 - Make VCL.xcu more SCM friendly
Summary: Make VCL.xcu more SCM friendly
Alias: None
Product: gsl
Classification: Code
Component: code (show other issues)
Version: 680m51
Hardware: All All
: P3 Trivial (vote)
Target Milestone: AOO PleaseHelp
Assignee: AOO issues mailing list
QA Contact:
Depends on:
Blocks: 54091
  Show dependency tree
Reported: 2004-08-25 10:40 UTC by
Modified: 2017-05-20 11:29 UTC (History)
1 user (show)

See Also:
Latest Confirmation in: ---
Developer Difficulty: ---


Note You need to log in before you can comment on or make changes to this issue.
Description 2004-08-25 10:40:19 UTC
When resyncing or integrating child workspaces the VCL.xcu configuration file
often causes merge conflicts. These merge conflicts are very hard to resolve
manually because they often contain "unusual characters", especially when the
default font lists are involved. The root cause for the high probability of
merge conflicts is that the lines in this configuration file tend to become very
long and they are relatively often changed, e.g. to better support new
distributions, new font families and changed user preferences...

=> make it possible to split the long font name lists in the VCL.xcu file and
convert the file to this CVS friendly format
Comment 1 2004-08-25 10:40:44 UTC
Comment 2 2009-09-07 15:59:20 UTC
good riddance CVS
Comment 3 Marcus 2017-05-20 11:29:25 UTC
Reset assigne to the default "".