From owner-freebsd-questions@FreeBSD.ORG  Mon Dec 27 21:59:59 2010
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1F23106566C
	for <freebsd-questions@freebsd.org>;
	Mon, 27 Dec 2010 21:59:59 +0000 (UTC)
	(envelope-from lists@stringsutils.com)
Received: from manuel.natserv.net (p65-147.acedsl.com [66.114.65.147])
	by mx1.freebsd.org (Postfix) with ESMTP id 74DE68FC13
	for <freebsd-questions@freebsd.org>;
	Mon, 27 Dec 2010 21:59:59 +0000 (UTC)
Received: from shelca (zoraida.natserv.net [66.114.65.147])
	by manuel.natserv.net (Postfix) with ESMTP id 3BE58F449
	for <freebsd-questions@freebsd.org>;
	Mon, 27 Dec 2010 16:43:44 -0500 (EST)
Message-ID: <cone.1293486224.208998.9682.1000@shelca>
X-Mailer: http://www.courier-mta.org/cone/
From: Francisco Reyes <lists@stringsutils.com>
To: Free BSD Questions list <freebsd-questions@freebsd.org>
Date: Mon, 27 Dec 2010 16:43:44 -0500
Mime-Version: 1.0
Content-Type: text/plain; format=flowed; charset="US-ASCII"
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Subject: Reversed (or previously applied) patch detected
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Dec 2010 21:59:59 -0000

I was doing some exercises to get familiar with diff/patch.

Tried:
cd
mkdir tmp
cd tmp
mkdir original
mkdir changed
echo Line1 > original/File1
echo Line2 >>original/File1
echo Line4 >>original/File1

echo Line1 > changed/File1
echo Line2 >>changed/File1
echo Line3 >>changed/File1
echo Line4 >>changed/File1

echo 1 > original/File2
echo 2 >>original/File2
echo 4 >>original/File2

echo 1 > changed/File2
echo 2 >>changed/File2
echo 3 >>changed/File2
echo 4 >>changed/File2

diff -urN original changed > dir.diff

Which produced:
diff -ruN original/File1 changed/File1
--- original/File1      2010-12-26 23:07:41.000000000 -0500
+++ changed/File1       2010-12-26 23:08:26.000000000 -0500
@@ -1,3 +1,5 @@
 Line1
 Line2
+Line3
 Line4
+Line5
diff -ruN original/File2 changed/File2
--- original/File2      2010-12-26 23:08:08.000000000 -0500
+++ changed/File2       2010-12-26 23:08:35.000000000 -0500
@@ -1,3 +1,8 @@
 1
 2
+3
 4
+5
+6
+7
+8


Then tried
patch < dir.diff


The patch command gives the warning:
Reversed (or previously applied) patch detected

Tried a few other variations like
patch -p <dir.diff

It will run without errors with
patch -R < dir.diff

But that will make the "changed" files be like the original instead of 
patching the original files.

Any ideas/hints?