Received: from spf5.us4.outblaze.com (spf5.us4.outblaze.com [205.158.62.27]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iALNOo4h012475 for ; Sun, 21 Nov 2004 23:24:51 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf5.us4.outblaze.com (Postfix) with ESMTP id 6F2A777119 for ; Sun, 21 Nov 2004 23:24:52 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW1Df-0000cC-6s for migo@homemail.com; Sun, 21 Nov 2004 18:34:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW1DE-0000bs-Bl for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:33:44 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW1DD-0000bX-GV for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:33:43 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW1DD-0000bN-DZ for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:33:43 -0500 Received: from [66.216.124.41] (helo=server4.panoramicfeedback.com) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CW146-0002tf-Kn for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 18:24:18 -0500 Received: from [192.168.0.7] (server4.panoramicfeedback.com [66.216.124.41]) by server4.panoramicfeedback.com (8.12.3/8.12.3/Debian-6.6) with ESMTP id iALNNeil030924; Sun, 21 Nov 2004 18:23:40 -0500 Message-ID: <41A1237C.6020303@panoramicfeedback.com> Date: Sun, 21 Nov 2004 18:23:40 -0500 From: Aaron Bentley User-Agent: Mozilla Thunderbird 0.8 (X11/20040926) X-Accept-Language: en-us, en MIME-Version: 1.0 To: John A Meinel Subject: Re: [Gnu-arch-users] diff markers/ star merge References: <1101070919.6134.11.camel@localhost.localdomain> <41A112A4.4070207@panoramicfeedback.com> <20041121222245.GC23410@rogers.com> <41A1161D.7020708@arbash-meinel.com> In-Reply-To: <41A1161D.7020708@arbash-meinel.com> X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Panometrics-MailScanner: Found to be clean Cc: arch , "Dimitrie O. Paun" , Zenaan Harkness X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 437 Lines: 17 John A Meinel wrote: > Could apply delta be modified to support a reference version? No, that wouldn't make sense. apply-delta has all the necessary inputs, you just need to implement the three-way behavior. Aaron _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/