Info Catalog diffutils: Revision Control diffutils: Merging with patch diffutils: Creating and Removing

diffutils: Imperfect

 
 10.3 Applying Imperfect Patches
 ===============================
 
 'patch' tries to skip any leading text in the patch file, apply the
 diff, and then skip any trailing text.  Thus you can feed a mail message
 directly to 'patch', and it should work.  If the entire diff is indented
 by a constant amount of white space, 'patch' automatically ignores the
 indentation.  If a context diff contains trailing carriage return on
 each line, 'patch' automatically ignores the carriage return.  If a
 context diff has been encapsulated by prepending '- ' to lines beginning
 with '-' as per Internet RFC 934
 (ftp://ftp.isi.edu/in-notes/rfc934.txt), 'patch' automatically
 unencapsulates the input.
 
    However, certain other types of imperfect input require user
 intervention or testing.
 

Menu

 
· Changed White Space When tabs and spaces don't match exactly.
· Reversed Patches    Applying reversed patches correctly.
· Inexact             Helping 'patch' find close matches.
· Dry Runs            Predicting what 'patch' will do.
 

Info Catalog diffutils: Revision Control diffutils: Merging with patch diffutils: Creating and Removing