Matthew Dillon dillon at
Wed Oct 8 20:19:57 PDT 2003

:familiar with the conventions.
:cvs diff: Diffing .
:Index: signalvar.h
:RCS file: /home/dcvs/src/sys/sys/signalvar.h,v
:retrieving revision 1.5
:diff -r1.5 signalvar.h
:>         sig_t    ps_checkpoint;         /* place to store checkpoint/restore upcall */
:>         sig_t    ps_restore;

    Yah, the output of cvs diff makes an excellent patch.  If you have
    cvs add'd new files use 'cvs diff -N' to ensure that the new files
    are included in the patch.  Also, cvs diff from a high-enough level
    directory so the Index: lines are meaningful to the person doing the
    patching.  e.g. 'cd /usr/src/sys; cvs diff -N kern vm sys'.

    The defacto standard is also to use a unified diff, aka diff -u.  This
    can be set in your ~/.cvsrc or specified on the command line.  Most
    BSD developers seem to like unified diffs because they are far more
    readable once you get used to them.

# cat ~/.cvsrc
cvs -q -g
diff -u
update -Pd
checkout -P

    You can give diff -N too but I usually like to specify that one 


More information about the Kernel mailing list