Методические материалы Лохтурова Вячеслава

This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.

====== Утилиты diff и patch ======

  * [[https://youtu.be/vqPaHyisBB0|Видео: Утилиты diff и patch]]
  * [[http://ru.wikipedia.org/wiki/Patch_(UNIX)|patch (UNIX)]]

===== Сравнение каталогов =====

<code>
$ diff /usr/share /usr/local/share
</code>

===== Сравнение двоичных файлов =====
<code>
$ diff /usr/bin/test /usr/bin/[
 или
$ diff /bin/test /bin/[

$ ls -i /usr/bin/test /usr/bin/[
 или
$ ls -i /bin/test /bin/[
</code>

===== Сравнение текстовых файлов =====
<code>
$ cat hello.c
</code><code>
#include <stdio.h>
main () {
        printf("Hello World\n");
}
</code><code>
$ cp hello.c hello.c.old

$ cat hello.c
</code><code>
#include <stdio.h>
main () {
        printf("Hello World Again\n");
}
</code><code>
$ diff hello.c.old hello.c
</code><code>
3c3
<       printf("Hello World\n");
---
>       printf("Hello World Again\n");
</code><code>
diff -e hello.c.old hello.c
</code><code>
3c
        printf("Hello World Again\n");
.
</code><code>
$ diff hello.c.old hello.c > hello.patch

$ mv hello.c.old hello.c

$ patch hello.c hello.patch

$ cat hello.c
</code><code>
#include <stdio.h>
main () {
        printf("Hello World Again\n");
}
</code>

Методические материалы Лохтурова Вячеслава

User Tools

Site Tools

Page Tools