Re: patch backup files

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

On Thu, Aug 08, 2013 at 11:10:35AM +0200, Ignatios Souvatzis wrote:
> The original .orig are moved to .orig.orig, right?

I just tried, and breaking POLS, it doesn't! (or no longer does, I'm
pretty sure it used to...)

$ ls
foo       one.diff  two.diff
$ cat foo
hello
$ cat one.diff 
--- foo.orig    2013-08-09 16:32:06.000000000 +0100
+++ foo 2013-08-09 16:32:13.000000000 +0100
@@ -1 +1 @@
-hello
+hello world
$ cat two.diff 
--- foo.orig    2013-08-09 16:32:43.000000000 +0100
+++ foo 2013-08-09 16:32:52.000000000 +0100
@@ -1 +1 @@
-hello world
+hello there
$ patch < one.diff 
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- foo.orig   2013-08-09 16:32:06.000000000 +0100
|+++ foo        2013-08-09 16:32:13.000000000 +0100
--------------------------
Patching file foo using Plan A...
Hunk #1 succeeded at 1.
done
$ cat foo
hello world
$ ls
foo       foo.orig  one.diff  two.diff
$ patch < two.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- foo.orig   2013-08-09 16:32:43.000000000 +0100
|+++ foo        2013-08-09 16:32:52.000000000 +0100
--------------------------
Patching file foo using Plan A...
Hunk #1 succeeded at 1.
done
$ ls
foo       foo.orig  one.diff  two.diff

XXXXX No foo.orig.orig! XXXXX

$ cat foo
hello there
$ cat foo.orig 
hello world

Cheers,

Patrick