From owner-freebsd-questions@FreeBSD.ORG  Fri Nov 11 18:16:24 2005
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
X-Original-To: questions@freebsd.org
Delivered-To: freebsd-questions@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E9B8916A41F
	for <questions@freebsd.org>; Fri, 11 Nov 2005 18:16:24 +0000 (GMT)
	(envelope-from iaccounts@ibctech.ca)
Received: from pearl.ibctech.ca (pearl.ibctech.ca [209.167.58.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B684443D5D
	for <questions@freebsd.org>; Fri, 11 Nov 2005 18:16:20 +0000 (GMT)
	(envelope-from iaccounts@ibctech.ca)
Received: (qmail 26099 invoked by uid 1002); 11 Nov 2005 18:16:19 -0000
Received: from iaccounts@ibctech.ca by pearl.ibctech.ca by uid 89 with
	qmail-scanner-1.22 
	(spamassassin: 2.64.  Clear:RC:1(209.167.16.15):. 
	Processed in 3.514171 secs); 11 Nov 2005 18:16:19 -0000
Received: from unknown (HELO fuze) (209.167.16.15)
	by pearl.ibctech.ca with SMTP; 11 Nov 2005 18:16:15 -0000
From: "Steve Bertrand" <iaccounts@ibctech.ca>
To: "'FreeBSD Questions'" <questions@freebsd.org>
Date: Fri, 11 Nov 2005 13:16:15 -0500
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-Mailer: Microsoft Office Outlook, Build 11.0.5510
X-MIMEOLE: Produced By Microsoft MimeOLE V6.00.2800.1506
Thread-Index: AcXm7ADk1mG0/hQBQSOM/3XsAvsBcQ==
X-Qmail-Scanner-Message-ID: <113173297567526093@pearl.ibctech.ca>
Message-Id: <20051111181620.B684443D5D@mx1.FreeBSD.org>
Cc: 
Subject: Understanding a patch file [OT?]
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: Fri, 11 Nov 2005 18:16:25 -0000

Hi everyone...

This may be off-topic, but I know someone may be able to help. I am
trying to better understand how to use diff, and moreso, understand it's
output.

In particular, I can't quite grasp exactly what the identifiers in
between @@ and @@ represent exactly. Here is a patch file I created. The
first change looks like it will replace lines 1 through 5, but then I
look at the second change, and it completely confuses me (-11,6 +11,8).
Can someone please clarify why 11 and 8?

--- randbak.pl  Wed Oct 12 17:27:10 2005
+++ randbak2.pl Fri Nov 11 13:06:51 2005
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-
+#
 use warnings;
 use strict;
 use Storable;
@@ -11,6 +11,8 @@
 my $num;
 my $sum = "sum";
 my $total = 0;
+
+# Test

 if (-e "randomcount"){
        $href = retrieve ("randomcount");


Thank you for any advice!

Steve