Received: from fallback.us4.outblaze.com (fallback.us4.outblaze.com [205.158.62.120]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iAM581vo027785 for ; Mon, 22 Nov 2004 05:08:05 GMT Received: from cspf.us4.outblaze.com (cspf.us4.outblaze.com [205.158.62.117]) by fallback.us4.outblaze.com (Postfix) with ESMTP id 7A6BD1C1A4DB for ; Mon, 22 Nov 2004 02:49:48 +0000 (GMT) Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by cspf.us4.outblaze.com (Postfix) with ESMTP id 5D4261B40E2 for ; Mon, 22 Nov 2004 02:49:48 +0000 (GMT) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id C29FF53D01 for ; Mon, 22 Nov 2004 02:49:47 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW4Pz-00028x-Ki for migo@homemail.com; Sun, 21 Nov 2004 21:59:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW4Pb-00028i-GC for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW4Pa-000286-BE for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW4Pa-000283-8E for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:42 -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 1CW4GM-0004De-Dt for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:49:10 -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 iAM2mWil000903; Sun, 21 Nov 2004 21:48:33 -0500 Message-ID: <41A15380.6020907@panoramicfeedback.com> Date: Sun, 21 Nov 2004 21:48:32 -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> <41A1237C.6020303@panoramicfeedback.com> <41A12400.9080901@arbash-meinel.com> In-Reply-To: <41A12400.9080901@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: 511 Lines: 17 John A Meinel wrote: > gotcha. Because apply-delta grabs the pre and post to create the > changeset, and the just applies that changeset. Silly me. I've been working on getting apply-delta --three-way working, but somewhat hindered by the fact that you broke star-merge --three-way. 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/