Bug 106261

Summary: Tell people to use more diff context lines for XML in "Rules"
Product: xkeyboard-config Reporter: Mingye Wang (Arthur2e5) <arthur200126>
Component: docAssignee: xkb
Status: RESOLVED FIXED QA Contact:
Severity: enhancement    
Priority: medium    
Version: unspecified   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:

Description Mingye Wang (Arthur2e5) 2018-04-26 22:50:00 UTC 
rules/base.xml.in contains a lot of repetitive closing/opening tags that renders a patch's usual three-line context useless for merging, sometimes causing mis-merges with submitted patches (for example, with bug #105168).

Perhaps a short line of text can be added to the rules[1] that tells people to use more lines by passing "-U <lines>" instead of "-u" to "diff"? Seven lines are usually sufficient for rules/base.xml.in.
  [1]: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules/
Comment 1 Sergey V. Udaltsov 2018-05-14 22:27:16 UTC 
done, thanks!

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.