From 2e696c62326408a3e911b27e81802e505053642f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 8 Jun 2022 14:50:29 +0200 Subject: [PATCH] CONTRIBUTING.rst: Warn about white space changes --- CONTRIBUTING.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 700c1ed0..04593cf6 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -356,6 +356,12 @@ original FreeBSD code. Rules for Modifying FreeBSD Source ================================== +Do not reformat original FreeBSD code. Do not perform white space changes even +if you get git commit warnings. **Check your editor settings so that it does +not perform white space changes automatically**, for example adding a newline +to the end of the file. White space changes may result in conflicts during +updates, especially changes at the end of a file. + Changes in FreeBSD files must be done using ``__rtems__`` C pre-processor guards. This makes synchronization with the FreeBSD upstream easier and is very important. Patches which do not follow these rules will be rejected. Only add @@ -457,12 +463,6 @@ In general, provide empty header files and do not guard includes. For new code use `STYLE(9) `_. -Do not format original FreeBSD code. Do not perform white space changes even -if you get git commit warnings. Check your editor settings so that it doesn't -perform white space changes automatically, for example adding a newline to the -end of the file. White space changes may result in conflicts during updates, -especially changes at the end of a file. - Automatically Generated FreeBSD Files =====================================