[nycbug-talk] Reversed (or previously applied) patch detected
Francisco Reyes
lists at stringsutils.com
Tue Dec 28 16:35:31 EST 2010
John Baldwin writes:
> Try:
>
> cd original; patch -p1 < ../dir.diff
Thanks. That worked.
How can one the equivalent of an absolute path?
For, example I got a patch to a port and I just ran the patch command and it
updated the port. I didn't have to change to the port directory.
Just re-did my little experiment and used the full path to source on the
diff, then went into the source dir and ran patch without any parameter
other than the patch; it loaded properly. I still don't get why it would not
work from ~/tmp if the original diff had the full path (ie tried running
patch from ~/tmp and did not work).
The patch to the port was:
diff -ruN /usr/ports/databases/skytools/Makefile skytools/Makefile
--- /usr/ports/databases/skytools/Makefile 2010-12-02
22:55:36.000000000 +0800
+++ skytools/Makefile 2010-12-26 06:00:36.000000000 +0800
@@ -6,9 +6,9 @@
#
PORTNAME= skytools
-PORTVERSION= 2.1.11
+PORTVERSION= 2.1.12
CATEGORIES= databases
-MASTER_SITES= http://pgfoundry.org/frs/download.php/2561/
+MASTER_SITES= http://pgfoundry.org/frs/download.php/2872/
MAINTAINER= kheechin at gmail.com
COMMENT= PostgreSQL tools from Skype: walshipping, queueing,
replication
diff -ruN /usr/ports/databases/skytools/distinfo skytools/distinfo
--- /usr/ports/databases/skytools/distinfo 2010-03-28
06:51:56.000000000 +0800
+++ skytools/distinfo 2010-12-26 06:08:32.000000000 +0800
@@ -1,3 +1,2 @@
-MD5 (skytools-2.1.11.tar.gz) = 1451a5fc47bf9a28339f7dff28d8b11a
-SHA256 (skytools-2.1.11.tar.gz) =
fdfbb428d41a5f16c3cf7b7a3a0dcc5e500e102c898311825310a30889a82c71
-SIZE (skytools-2.1.11.tar.gz) = 249019
+SHA256 (skytools-2.1.12.tar.gz) =
f385947b121a05d9d64ca70dd46585f592161ad939303735ebb9d62f246d6ac0
+SIZE (skytools-2.1.12.tar.gz) = 259101
More information about the talk
mailing list