[BACK]Return to patch.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / patch

Diff for /src/usr.bin/patch/patch.1 between version 1.28.2.1 and 1.29

version 1.28.2.1, 2015/07/27 16:10:54 version 1.29, 2015/03/13 19:58:41
Line 479 
Line 479 
 file name, and choose the file name with the fewest path components,  file name, and choose the file name with the fewest path components,
 the shortest basename, and the shortest total file name length (in that order).  the shortest basename, and the shortest total file name length (in that order).
 .It  .It
   If no file exists,
   .Nm
   checks for the existence of the files in an RCS directory
   (using the appropriate suffix) using the criteria specified
   above.
   If found,
   .Nm
   will attempt to get or check out the file.
   .It
 If no suitable file was found to patch, the patch file is a context or  If no suitable file was found to patch, the patch file is a context or
 unified diff, and the old file was zero length, the new file name is  unified diff, and the old file was zero length, the new file name is
 created and used.  created and used.
Line 677 
Line 686 
 If code has been duplicated (for instance with #ifdef OLDCODE ... #else ...  If code has been duplicated (for instance with #ifdef OLDCODE ... #else ...
 #endif),  #endif),
 .Nm  .Nm
 is incapable of patching both versions, and, if it works at all, will likely  is incapable of patching both versions and, if it works at all, will likely
 patch the wrong one, and tell you that it succeeded to boot.  patch the wrong one, and tell you that it succeeded to boot.
 .Pp  .Pp
 If you apply a patch you've already applied,  If you apply a patch you've already applied,
Legend:
Removed from v.1.28.2.1  
changed lines
  Added in v.1.29