Hi,
On 05/02/2018 12:09 AM, Tony Mechelynck wrote:
On Tue, May 1, 2018 at 6:12 PM, Erik Auerswald <[email protected]>
wrote:
while CONTRIBUTING.md asks for unified diff format and it is suggested to
use 'git diff' which creates unified diff output, the file 'develop.txt'
claims that context diff format is preferred. The attached patch changes
the latter file to prefer unified diff as well.
In practice, Bram publishes his patches to the vim_dev list and the
http://ftp.vim.org/pub/vim/patches/8.0/ directory in the older
"non-unified" context diff format but accepts unified-diff patches
submitted by contributors.
Thanks for this information.
I won't second-guess him though: does he indeed
prefer -c or does he regard -c and -u as equally human-readable? Don't ask
me. IMHO the help _could_ be modified to mention unified diff (and the git
diff format, which clones of the Mercurial mirror can also produce) but
(non-unified) context diff _should_ be kept in.
> [...]
P.S. It wasn't broke, so why are you fixing it? :-P
IMHO inconsistent information is "broken," and CONTRIBUTING.md tells a
different story than develop.txt:
CONTRIBUTING.md is quite specific with the preference, after allowing
everything:
"Patches are welcome in whatever form."
...
"An attachment with a unified diff format is preferred."
Those lines are from September 2015.
develop.txt also states a preference:
"For sending patches a context diff "diff -c" is preferred."
That line is from 2004. A line from 2013 follows stating to look at
"http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch";
which describes the use of "diff -c".
Thus the most recent version states a preference for unified diff
format, which is the format used by e.g. "git diff," and is quite often
the preferred format.
Anyway, the intention of my patch is to improve the consistency of this
part of the documentation, to help people like me that read said
documentation before sending a patch. ;-)
Thanks,
Erik
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
