[PATCH] CONTRIBUTING: Warn about white space changes

[Joel Sherrill]

This looks good. I would have said "not reformat code" but that's ok.

--joel

On Wed, Jun 8, 2022 at 7:57 AM Sebastian Huber <
sebastian.huber at embedded-brains.de> wrote:

> ---
>  CONTRIBUTING.rst | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
> index 79a42db1..36cd91de 100644
> --- a/CONTRIBUTING.rst
> +++ b/CONTRIBUTING.rst
> @@ -279,6 +279,12 @@ original FreeBSD code.
>  Rules for Modifying FreeBSD Source
>  ==================================
>
> +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
> +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
> @@ -380,12 +386,6 @@ In general, provide empty header files and do not
> guard includes.
>  For new code use
>  `STYLE(9) <
> http://www.freebsd.org/cgi/man.cgi?query=style&apropos=0&sektion=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
>  =====================================
>
> --
> 2.35.3
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/devel/attachments/20220608/22b3227d/attachment.htm>