递归diff以创建补丁并递归地应用补丁

Poe*_*Poe 5 diff patch

我在使用补丁时遇到了麻烦.我有2个文件夹,包含许多子文件夹和文件.

diff -ur backup/www/ www/ > sync.patch

接下来,我正在尝试应用补丁.

patch < sync.patch

File to patch:你可以看到它问我.

|diff -ur ./backup/www/members/categorize.php ./www/members/categorize.php
|--- ./backup/www/members/categorize.php   2012-12-13 15:19:41.000000000 -0500
|+++ ./www/members/categorize.php   2012-10-15 23:32:12.000000000 -0400
--------------------------
File to patch:
Run Code Online (Sandbox Code Playgroud)

文件./www/members/categorize.php存在.

Oli*_*rth 6

您可能需要调查-p标志patch,该标志控制目录前缀的处理方式.请参见手册页.

  • 谢谢,我使用`patch -t -p0 <sync.patch`来应用补丁 (3认同)