Return-Path: Delivered-To: apmail-db-derby-dev-archive@www.apache.org Received: (qmail 79863 invoked from network); 10 Sep 2004 00:58:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 Sep 2004 00:58:36 -0000 Received: (qmail 99496 invoked by uid 500); 10 Sep 2004 00:58:36 -0000 Delivered-To: apmail-db-derby-dev-archive@db.apache.org Received: (qmail 99447 invoked by uid 500); 10 Sep 2004 00:58:35 -0000 Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: List-Id: "Derby Development" Reply-To: "Derby Development" Delivered-To: mailing list derby-dev@db.apache.org Received: (qmail 99435 invoked by uid 99); 10 Sep 2004 00:58:35 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from [130.236.254.3] (HELO mail.lysator.liu.se) (130.236.254.3) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 09 Sep 2004 17:58:31 -0700 Received: by mail.lysator.liu.se (Postfix, from userid 1646) id A284D16C263; Fri, 10 Sep 2004 02:58:22 +0200 (MEST) Received: from fetto.lysator.liu.se (fetto.lysator.liu.se [130.236.254.41]) by mail.lysator.liu.se (Postfix) with ESMTP id 72F8716C2B6 for ; Fri, 10 Sep 2004 02:58:20 +0200 (MEST) Received: from bamse.yesco.org (unknown [204.215.142.140]) by fetto.lysator.liu.se (Postfix) with ESMTP id CCF3052DFB for ; Fri, 10 Sep 2004 02:58:18 +0200 (CEST) Date: Thu, 09 Sep 2004 17:54:38 -0700 Message-Id: From: "Jonas S Karlsson" To: "Derby Development" In-Reply-To: <5299021D-02BF-11D9-9789-003065CBB010@nonintuitive.com> Subject: Re: moving patches between unix and windows? X-Spam-Checker-Version: SpamAssassin 2.63-lysator_fetto_1.2 (2004-01-11) on fetto.lysator.liu.se X-Spam-Level: X-Spam-Status: No, hits=0.0 required=5.0 tests=none autolearn=no version=2.63-lysator_fetto_1.2 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Andrew wrote: >I've been working with different patches and trying to move patches >back and forth between different Unix and Windows machines for testing >and it's a bit of a pain. Going either way, line-ending conversion is >necessary. "man patch" says: patch tries to skip any leading garbage, apply the diff, and then skip any trailing garbage. Thus you could feed an article or message con- taining a diff listing to patch, and it should work. If the entire diff is indented by a consistent amount, or if a context diff contains lines ending in CRLF or is encapsulated one or more times by prepending "- " to lines starting with "-" as specified by Internet RFC 934, this is taken into account. After removing indenting or encapsulation, lines beginning with # are ignored, as they are considered to be com- ments. I don't think that unixtools expect the source to contain CRLF which I believe all of Derby code does. This often shows up as "extra" ^M at the end of each line in emacs for example... It seems that patch does it's best to ignore CRLF in the diff input that it takes, but maybe it doesn't handle it in the actual source. /Jonas