Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Vt3R7-0006nP-IB for bitcoin-development@lists.sourceforge.net; Tue, 17 Dec 2013 22:48:21 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of gmail.com designates 209.85.220.46 as permitted sender) client-ip=209.85.220.46; envelope-from=gmaxwell@gmail.com; helo=mail-pa0-f46.google.com; Received: from mail-pa0-f46.google.com ([209.85.220.46]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Vt3R6-0005Xt-SH for bitcoin-development@lists.sourceforge.net; Tue, 17 Dec 2013 22:48:21 +0000 Received: by mail-pa0-f46.google.com with SMTP id kl14so5119810pab.33 for ; Tue, 17 Dec 2013 14:48:15 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.68.52.202 with SMTP id v10mr30571019pbo.118.1387320494975; Tue, 17 Dec 2013 14:48:14 -0800 (PST) Received: by 10.70.81.170 with HTTP; Tue, 17 Dec 2013 14:48:14 -0800 (PST) In-Reply-To: <20131217224130.GC3180@nl.grid.coop> References: <20131217224130.GC3180@nl.grid.coop> Date: Tue, 17 Dec 2013 14:48:14 -0800 Message-ID: From: Gregory Maxwell To: Troy Benjegerdes Content-Type: text/plain; charset=UTF-8 X-Spam-Score: -1.6 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (gmaxwell[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: hozed.org] X-Headers-End: 1Vt3R6-0005Xt-SH Cc: Bitcoin Development Subject: Re: [Bitcoin-development] RFC: MERGE transaction/script/process for forked chains X-BeenThere: bitcoin-development@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:48:21 -0000 On Tue, Dec 17, 2013 at 2:41 PM, Troy Benjegerdes wrote: > I want to get some feedback.. I've used distributed version control > systems for a long time, and the most useful feature is to be able > to merge two different forks. We already automatically merge forks that we become aware of simply by pulling in all the novel non-conflicting transactions the fork contains and including them in our next blocks.