Return-Path: Delivered-To: apmail-forrest-user-archive@www.apache.org Received: (qmail 66988 invoked from network); 15 Dec 2005 05:38:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Dec 2005 05:38:52 -0000 Received: (qmail 60082 invoked by uid 500); 15 Dec 2005 05:38:52 -0000 Delivered-To: apmail-forrest-user-archive@forrest.apache.org Received: (qmail 60025 invoked by uid 500); 15 Dec 2005 05:38:51 -0000 Mailing-List: contact user-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: user@forrest.apache.org List-Id: Delivered-To: mailing list user@forrest.apache.org Received: (qmail 60013 invoked by uid 99); 15 Dec 2005 05:38:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2005 21:38:51 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=HTML_MESSAGE X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [168.230.48.248] (HELO sdomsgpf00.corp.fairisaac.com) (168.230.48.248) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Dec 2005 21:38:49 -0800 Received: from SDOMSGMB00.corp.fairisaac.com ([10.80.3.71]) by sdomsgpf00.corp.fairisaac.com with Microsoft SMTPSVC(6.0.3790.1830); Wed, 14 Dec 2005 21:38:28 -0800 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----_=_NextPart_001_01C60139.C65B0B38" Subject: Protocol for submitting patches to the issue tracker Date: Wed, 14 Dec 2005 21:38:26 -0800 Message-ID: <034043EC81DEDE4CA779BDE7C7E6C7D901F13CD3@SDOMSGMB00.corp.fairisaac.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Protocol for submitting patches to the issue tracker thread-index: AcYBOcV9tMcQedfLRwqTsgCkh6Ba5Q== From: "Calmbach, Richard" To: X-OriginalArrivalTime: 15 Dec 2005 05:38:28.0460 (UTC) FILETIME=[C6AC92C0:01C60139] X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. ------_=_NextPart_001_01C60139.C65B0B38 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This is from the issue "Clearer forrestbot documentation" (http://issues.apache.org/jira/browse/FOR-568): =20 Comment by Ross Gardler [14/Dec/05 12:16 PM]: > Please note that the diff was incorrectly made. It was against a file called > forrest.xml.orig and therefore could not be applied without manual interention. =20 I want to learn how to do this right. I should mention that even though the patch is against SVN HEAD, I did not use Subversion to check out the sources (I haven't installed Subversion yet), I simply downloaded forrestbot.xml via the ViewCVS web interface. I figured the closest match to my situation were the instructions for users of a downloaded released version of Forrest (http://forrest.apache.org/contrib.html#patch), hence the .orig. =20 I experimented a bit with patch (I used GNU patch 2.5.4): Even if the input file is "forrestbot.xml", doing "patch < forrestbot.xml.diff2" successfully applies the patch to that file and the output is still named "forrestbot.xml". =20 Even if that doesn't work, isn't it just a matter of "patch forrestbot.xml forrestbot.xml.diff2"? =20 What is the recommended procedure? (Other than "Install Subversion!", which I will do - it's on my list :-). =20 -Richard ------_=_NextPart_001_01C60139.C65B0B38 Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
This is from the issue "Clearer = forrestbot=20 documentation" (http://issues.apach= e.org/jira/browse/FOR-568):
 
Comment by Ross Gardler [14/Dec/05 = 12:16=20 PM]:
> Please note that the diff was = incorrectly=20 made. It was against a file called
> forrest.xml.orig and = therefore could not=20 be applied without manual interention.
 
I want to learn how to do this right. I = should=20 mention that even though the patch is against SVN HEAD, I did not=20 use Subversion to check out the sources (I haven't installed = Subversion=20 yet), I simply downloaded forrestbot.xml via the ViewCVS web interface. = I=20 figured the closest match to my situation were the instructions for = users=20 of a downloaded released version of Forrest (http://forrest.apac= he.org/contrib.html#patch),=20 hence the .orig.
 
I experimented a bit with patch (I = used GNU=20 patch 2.5.4): Even if the input file is "forrestbot.xml", doing "patch = <=20 forrestbot.xml.diff2" successfully applies the patch to that file and = the output=20 is still named "forrestbot.xml".
 
Even if that doesn't work, isn't it = just a matter=20 of "patch forrestbot.xml forrestbot.xml.diff2"?
 
What is the recommended procedure? = (Other than=20 "Install Subversion!", which I will do - it's on my list = :-).
 
-Richard
------_=_NextPart_001_01C60139.C65B0B38--