svn diff 与 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

发布了256 篇原创文章 · 获赞 184 · 访问量 114万+
展开阅读全文

没有更多推荐了,返回首页

©️2019 CSDN 皮肤主题: 大白 设计师: CSDN官方博客

分享到微信朋友圈

×

扫一扫,手机浏览