patch和diff

1. 生成patch

diff -Naur olddir(oldfile) newdir(newfile) > new-patch
diff -Naur --exclude=.svn olddir newdir > new-patch

 

2. 使用patch

patch -p1 < new-patch
cat new-patch | patch -p1