[King@Fedora ~]$ mkdir -pv x/xx/xxx mkdir: 已创建目录 “x” mkdir: 已创建目录 “x/xx” mkdir: 已创建目录 “x/xx/xxx”
[King@Fedora ~]$ cd x/xx/xxx [King@Fedora xxx]$ cat >> xxx1 << EOF > 111111 > 111111 > EOF [King@Fedora xxx]$ cat >> xxx2 << EOF > 111111 > 222222 > EOF
[King@Fedora xxx]$ diff -y xxx1 xxx2 111111 111111 111111 | 222222
[King@Fedora xxx]$ diff -Naru xxx1 xxx2 > xxx.patch [King@Fedora xxx]$ cat xxx.patch - - - xxx1 2009-12-19 22:28:26.582959182 +0800 +++ xxx2 2009-12-19 22:28:42.798928591 +0800 @@ -1,2 +1,2 @@ 111111 - 111111 +222222
[King@Fedora xxx]$ cd .. [King@Fedora xx]$ diff -Naru xxx/xxx1 xxx/xxx2 > xx.patch [King@Fedora xx]$ cat xx.patch --- xxx/xxx1 2009-12-19 22:28:26.582959182 +0800 +++ xxx/xxx2 2009-12-19 22:28:42.798928591 +0800 @@ -1,2 +1,2 @@ 111111 -111111 +222222
[King@Fedora xx]$ cd .. [King@Fedora x]$ diff -Nu xx/xxx/xxx1 xx/xxx/xxx2 > x.patch [King@Fedora x]$ cat x.patch --- xx/xxx/xxx1 2009-12-19 22:28:26.582959182 +0800 +++ xx/xxx/xxx2 2009-12-19 22:28:42.798928591 +0800 @@ -1,2 +1,2 @@ 111111 -111111 +222222
[King@Fedora x]$ cp x.patch xx/xxx/ [King@Fedora x]$ cp xx/xx.patch xx/xxx/
[King@Fedora x]$ cd xx/xxx [King@Fedora xxx]$ ls x.patch xx.patch xxx1 xxx2 xxx.patch [King@Fedora xxx]$ patch-p0< xxx.patch #用第二个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < xxx.patch #用第一个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111 [King@Fedora xxx]$ patch -p1 < xx.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < xxx.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111 [King@Fedora xxx]$ patch -p2 < x.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < x.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111
[King@Fedora xx]$ patch-p0 < xx.patch # 用第二个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < xxx.patch #用第一个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111 [King@Fedora xxx]$ patch -p1 < x.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < xxx.patch patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111
[King@Fedora x]$ patch-p0< x.patch # 用第二个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 222222 [King@Fedora xxx]$ patch -RE < xxx.patch #用第一个的 补丁 修改 第一个文件 patching file xxx1 [King@Fedora xxx]$ cat xxx1 111111 111111
[King@Fedora x]$ patch x/xx/xxx/xxx1 < x.patch # 用补丁x.patch 直接修改 文件xxx1,因为没有用p参数,所以 会 忽略掉补丁文件里的 所有目录。
# mkdir demo # cd demo
# mkdir -p old/a/b # vi old/a/b/foo.txt old_line_1 old_line_2
# cp -r old new # vi new/a/b/foo.txt new_line_1 new_line_2
# LC_ALL=C TZ=UTC0 diff -Naur old new > foo.patch
# diff -Naur old new > foo.patch
# cat foo.patch diff -Naur old/a/b/foo.txt new/a/b/foo.txt --- old/a/b/foo.txt 2009-12-07 20:40:07.000000000 +0800 +++ new/a/b/foo.txt 2009-12-07 20:41:51.000000000 +0800 @@ -1,2 +1,2 @@ -old_line_1 -old_line_2 +new_line_1 +new_line_2
#tree demo |-- old | `-- a | `-- b | `-- foo.txt |-- new | `-- a | `-- b | `-- foo.txt -- foo.patch
# patch -p0 < foo.patch patching file old/a/b/foo.txt
--- old/a/b/foo.txt
# cat old/a/b/foo.txt new_line_1 new_line_2
# patch -p0 < foo.patch patching file old/a/b/foo.txt Reversed (or previously applied) patch detected! Assume -R? [n] y
# cat old/a/b/foo.txt old_line_1 old_line_2
# patch -Np0 < foo.patch
# patch -Rp0 < foo.patch
# cd old
# patch -p1 < ../foo.patch patching file a/b/foo.txt
--- old/a/b/foo.txt
# cd a # patch -p2 < ../../foo.patch patching file b/foo.txt # cd b # patch -p3 < ../../../foo.patch patching file foo.txt
# patch < ../../../foo.patch patching file foo.txt
机械节能产品生产企业官网模板...
大气智能家居家具装修装饰类企业通用网站模板...
礼品公司网站模板
宽屏简约大气婚纱摄影影楼模板...
蓝白WAP手机综合医院类整站源码(独立后台)...苏ICP备2024110244号-2 苏公网安备32050702011978号 增值电信业务经营许可证编号:苏B2-20251499 | Copyright 2018 - 2025 源码网商城 (www.ymwmall.com) 版权所有