本文介绍了如何使用SVN生成diff文件及patch，并详细解释了如何应用这些patch进行代码更新，包括逆向删除操作。此外，还解析了patch命令中的-p参数作用，帮助读者更好地理解并实践patch的应用。
生成diff文件：
svn diff > xxx.diff
生成 patch:
同事 A 运行如下命令生成 patch:
svn diff > aaa.patch
应用 patch:
同事 B 运行如下命令应用 patch:
patch –p0 < ../aaa.patch
当他 review 完代码，想删除该 patch 时， 可运行：
patch –p0 -R < ../aaa.patch
man了下patch，了解了p0的含义：
-pnum or --strip=num
Strip the smallest prefix containing num leading
slashesfrom each file name found in the patch file. A
sequence of one or more adjacentslashes is counted as
a singleslash. This controls how file namesfound in
the patchfile are treated, in case you keep your files
in adifferent directory than the person who sent out
thepatch. For example, supposing the filename in the
patchfile was
/u/howard/src/blurfl/blurfl.c
setting-p0 gives the entire file name unmodified, -p1
gives
u/howard/src/blurfl/blurfl.c
withoutthe leading slash, -p4 gives
blurfl/blurfl.c
扫一扫
被折叠的 条评论
为什么被折叠?
到【灌水乐园】发言
