18 / 1

18 / 2

:
:

18 / 3

:










: )(

18 / 4

:

.

) diff . (patch

18 / 5

. .

playonlinux
wine
playonlinux
.

18 / 6

.
18 / 7

:

diff : patch

yum install diff patch

) (.

18 / 8

apt-get install diff patch

) ( ..

:
:

1.c
mosaab
hosni
alzoubi

: 2.c

18 / 9

mosaab
alzoubi

c.1 c.1 c.2 .1

patch :

diff -u 1.c 2.c > 1.patch

patch.1 :

--- 1 2010-12-08 00:44:05.751592377 +0200

2010-12-08 00:44:16.467592099 +0200

+++ 2

@@ @@ -1,3 +1,2
mosaab

18 / 10

-hosni
alzoubi

: c.1 c.2 patch.2

diff -u 2.c 1.c > 2.patch
: patch.2

--- 2 2010-12-08 00:44:16.467592099 +0200

+++ 1

2010-12-08 00:44:05.751592377 +0200

@@ -1,2 +1,3 @@
mosaab
+hosni
alzoubi

18 / 11

^_^

patch
patch.1 c.1 :

patch < 1.patch

c.1 c.2

) c.2 ( :

patch < 2.patch

18 / 12

1 2 c.1 .2

c 1 2 c.1 c.2 c.2

c.1 .

1 . 2
1 :

c.1 :
mosaab
hosni
alzoubi
c.2 :
mosaab

18 / 13

alzoubi

2 :
c.1 :
mosaab
alzoubi

c.2 :
mosaab
hosni
alzoubi

1 2 patch.1
:

18 / 14

diff -rupN 1/ 2/ > 1.patch

: patch.1

diff -rupN 1/1 2/1

--- 1/1

2010-12-08 00:44:05.751592000 +0200

+++ 2/1

1970-01-01 02:00:00.000000000 +0200

@@ -1,3 +0,0 @@
-mosaab
-hosni
-alzoubi
diff -rupN 1/1.c 2/1.c

18 / 15

--- 1/1.c 1970-01-01 02:00:00.000000000 +0200

+++ 2/1.c 2010-12-08 01:12:22.955668231 +0200
@@ -0,0 +1,2 @@
+mosaab
+alzoubi
diff -rupN 1/2 2/2
--- 1/2

2010-12-08 00:44:16.467592000 +0200

+++ 2/2

1970-01-01 02:00:00.000000000 +0200

@@ -1,2 +0,0 @@
-mosaab
-alzoubi
diff -rupN 1/2.c 2/2.c
--- 1/2.c 1970-01-01 02:00:00.000000000 +0200
+++ 2/2.c 2010-12-08 01:13:03.459747244 +0200

18 / 16

@@ @@ -0,0 +1,3
+mosaab
+hosni
+alzoubi

1 1 .1
patch :

patch -p1 < ~/1.patch

-=-=-=-=-=-=-=-=-=-=-=-=-=-

18 / 17

1432 / 1 / 1
1433 / 12 / 19

18 / 18