diff and patch

A patch captures the changes of two different files (oldfile and newfile). Given the oldfile and the patch, one can use the patch program to create the newfile. This is exactly what we want. When you have done all the modifications, you can perform a command like this:

diff -ruNp minix_src_clean/ proj0/ > patch

this will creat a new file called patch.

You can test whether your patch has worked by creating another copy of the source tree and running patch as so:

cp -r minix_src_clean test
cd test
patch -p1 < ../patch

diff and patch

原文：http://www.cnblogs.com/miaoz/p/3952703.html