simple example: ==========
me@ant(15)~/tmp$ cat a a me@ant(16)~/tmp$ cat b a\nb me@ant(17)~/tmp$ echo "a" > b me@ant(18)~/tmp$ echo "b" >> b me@ant(19)~/tmp$ cat a a me@ant(20)~/tmp$ cat b a b me@ant(21)~/tmp$ diff -C 3 a b *** a 2011-02-17 02:27:51.000000000 -0500 --- b 2011-02-17 02:28:53.000000000 -0500 *************** *** 1 **** --- 1,2 ---- a + b me@ant(22)~/tmp$ diff -C 3 a b > ab.diff me@ant(23)~/tmp$ ls total 12 -rw-r--r-- 1 me me 2 Feb 17 02:27 a -rw-r--r-- 1 me me 132 Feb 17 02:29 ab.diff -rw-r--r-- 1 me me 4 Feb 17 02:28 b me@ant(24)~/tmp$ patch --dry-run -b a ab.diff patching file a me@ant(25)~/tmp$ ls total 12 -rw-r--r-- 1 me me 2 Feb 17 02:27 a -rw-r--r-- 1 me me 132 Feb 17 02:29 ab.diff -rw-r--r-- 1 me me 4 Feb 17 02:28 b me@ant(26)~/tmp$ touch a.orig me@ant(27)~/tmp$ patch --dry-run -b a ab.diff patching file a me@ant(28)~/tmp$ ls total 12 -rw-r--r-- 1 me me 2 Feb 17 02:27 a -rw-r--r-- 1 me me 132 Feb 17 02:29 ab.diff -rw-r--r-- 1 me me 0 Feb 17 02:30 a.orig -rw-r--r-- 1 me me 4 Feb 17 02:28 b me@ant(29)~/tmp$ patch -b a ab.diff patching file a me@ant(30)~/tmp$ ls total 16 -rw-r--r-- 1 me me 4 Feb 17 02:31 a -rw-r--r-- 1 me me 132 Feb 17 02:29 ab.diff -rw-r--r-- 1 me me 2 Feb 17 02:27 a.orig -rw-r--r-- 1 me me 4 Feb 17 02:28 b # # whups, where did a.orig go? # me@ant(31)~/tmp$ diff -C 3 a.orig a *** a.orig 2011-02-17 02:27:51.000000000 -0500 --- a 2011-02-17 02:31:19.000000000 -0500 *************** *** 1 **** --- 1,2 ---- a + b me@ant(32)~/tmp$ diff -C 3 a.orig a > ab.newdiff me@ant(33)~/tmp$ patch -b a.orig ab.newdiff patching file a.orig me@ant(34)~/tmp$ ls total 24 -rw-r--r-- 1 me me 4 Feb 17 02:31 a -rw-r--r-- 1 me me 132 Feb 17 02:29 ab.diff -rw-r--r-- 1 me me 137 Feb 17 03:12 ab.newdiff -rw-r--r-- 1 me me 4 Feb 17 03:12 a.orig -rw-r--r-- 1 me me 2 Feb 17 02:27 a.orig.orig -rw-r--r-- 1 me me 4 Feb 17 02:28 b me@ant(35)~/tmp$ # # this is really strange... # # a.orig.orig now gets created? i stop here now... # =================== -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
