文档章节

Comparing and Merging Files with GNU diff and p...

tadcat
 tadcat
发布于 2013/07/28 18:15
字数 281
阅读 12
收藏 0

http://www.network-theory.co.uk/diff/manual/

Picture of Cover

Comparing and Merging Files with GNU diff and patch
by David MacKenzie, Paul Eggert, and Richard Stallman
Paperback (6"x9"), 120 pages
ISBN 0954161750
RRP £12.95 ($19.95)
"Well packaged... the quality of information is excellent" --- Linux User and Developer Magazine (Issue 36, Feb 2004) Get a printed copy>>>
Comparing and Merging Files with GNU diff and patch

Buy the book here! >>>
learn more

2.3 Showing Differences in Their Context
Usually, when you are looking at the differences between files, you will also want to see the parts of the files near the lines that differ, to help you understand exactly what has changed. These nearby parts of the files are called the context.

GNU diff provides two output formats that show context around the differing lines: context format and unified format. It can optionally show in which function or section of the file the differing lines are found.

If you are distributing new versions of files to other people in the form of diff output, you should use one of the output formats that show context so that they can apply the diffs even if they have made small changes of their own to the files. patch can apply the diffs in this case by searching in the files for the lines of context around the differing lines; if those lines are actually a few lines away from where the diff says they are, patch can adjust the line numbers accordingly and still apply the diff correctly. See section 10.3 Applying Imperfect Patches, for more information on using patch to apply imperfect diffs.

<<< previous table of contents next >>>

本文转载自:

下一篇: 二进制 补丁
tadcat

tadcat

粉丝 16
博文 970
码字总数 154845
作品 0
石景山
私信 提问
linux 比较两个文件夹不同 (diff命令, md5列表)

比较文件夹diff,可以直接使用diff命令 [root@~]# diff -urNa dir1 dir2   -a Treat all files as text and compare them line-by-line, even if they do not seem to be text.   -N, -......

旭东的博客
2017/03/03
0
0
Git Support in VS Code

Originally, Visual Studio Code came with native support for Git, but recently, in order to allow support for other systems, the source control support also became an external pl......

Simone Chiaretta
2017/12/27
0
0
TortoiseSVN (命令行执行工具)

TortoiseSVN 命令 TortoiseSVN的GUI程序叫做。所有的命令通过参数指定,其中是必须的命令名。大多数此类命令至少需要一个路径参数,使用指定。在下面的命令表格中,命令引用的是参数,余下的...

robslove
2015/07/25
872
0
diff - 找出两个文件的不同点

DIFF(1) GNU Tools DIFF(1) NAME diff - 找出两个文件的不同点 总览 diff [选项] 源文件 目标文件 描述 在 最简单的情况是, diff 比较两个文件的内容 (源文件和 目标文件). 文件 名可以是 ...

zhongyilin
2014/03/04
0
0
git 1.7.9正式版发布,分布式版本控制工具

git 1.7.9正式版放出。2012-01-29. 完全改进 Git v1.7.9 Release Notes ======================== Updates since v1.7.8 -------------------- * gitk updates accumulated since early 201......

fei
2012/01/31
2.1K
4

没有更多内容

加载失败,请刷新页面

加载更多

反编译9.png图片还原

本文链接:https://blog.csdn.net/a1140778530/article/details/10528507 经常反编译apk文件找资源,9.png的文件处理起来很麻烦。 最近使用Ant自动编译打包app时,从别处搜罗来的9.png文件导...

shzwork
32分钟前
6
0
Shell脚本应用 – for、while循环语句

一、for循环语句 在实际工作中,经常会遇到某项任务需要多次执行的情况,而每次执行时仅仅是处理的对象不一样,其他命令相同。例如:根据通讯录中的姓名列表创建系统账号等情况。 当面对各种...

linux-tao
32分钟前
5
0
RPA风潮下企业财务工作模式的变革

RPA(机器人流程自动化)在财务领域的应用,正给企业财务带来前所未有的改变。 前RPA时代,财务领域面临的痛点 在RPA机器人应用之前,企业财务工作进程的推进,主要通过财务人员人工操作或信...

UiBot
37分钟前
5
0
Hive之命令行修改表注释

最近遇到一个需求,在不重建表的情况下,修改表的注释,hive有没有类似关系型数据库的SQL命令来修改呢,找了下,亲测有效,如下List-1 List-1 hive>use your_schemahvie>ALTER TABLE tabl...

克虏伯
37分钟前
5
0
是什么,它的作用是什么

在HTML文档的首部往往会有这么一句话<!DOCTYPE html>,许多时候我们忽视了它的存在,它实际上是一个声明,告诉浏览器用哪种HTML版本的规范来解读HTML文档。 尽管我们不给出这句声明浏览器照样...

前端老手
43分钟前
4
0

没有更多内容

加载失败,请刷新页面

加载更多

返回顶部
顶部