[Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2

Peter Funk pf@artcom-gmbh.de
Wed, 16 Feb 2000 16:28:56 +0100 (MET)


Hi!

Fred L. Drake:
[...]
> Latest round of changes from Peter Funk <pf@artcom-gmbh.de>.
[...]

You didn't apply the patch using the patch program but edited 
it manually?  Unfortunately you missed a small detail, which Fredrik
pointed out before.  I submitted the following patch (shortened here):

pf> *** ../../../Python-CVS_15_02_00-orig/dist/src/Doc/lib/libcrypt.tex     Tue Feb 
pf> --- Doc/lib/libcrypt.tex        Tue Feb 15 11:59:46 2000
[...]
pf>  import crypt, getpass, pwd
[...]
pf> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
[...]
pf> !         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
---------------------^^^^^^!

This is why I find unified context diffs far more superior than these old
style context diffs.  In unified context diffs such small changes don't
escape your eyes so easy, since old and new lines come directly after
each other.

[...]
> retrieving revision 1.14.4.2
> diff -C2 -r1.14.4.1 -r1.14.4.2
> *** libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
> --- libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
[...]
> ***************
> *** 39,45 ****
[...]
> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
>   \end{verbatim}
[...]
> !         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
> !     else:
> !         return 1
>   \end{verbatim}
[...]

Sorry for the nitpicking:  But I wanted to keep Fredrik satisfied.

Please let me know, if I can do anything on the content and format
of my patches to simplify the task of automatically applying them
to the CVS.  

For the time being I will try submit patches that fullfill
the following formal conditions:
 1. contain a small argument, why I believe the patch should be applied,
    atmost 3-4 lines of text;  
 2. contain the standard disclaimer;
 3. contain my signature;
 4. and contain finally the patch as an ancient style context diff relative to
    the dist/src subdirectory from a rather recent CVS tarball.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60