1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
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 <gmaxwell@gmail.com>) 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 <bitcoin-development@lists.sourceforge.net>;
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: <CAAS2fgT5S8x6njU6Le9tNwR_QWnoSGzfK38VLgnFfR=p=+t72g@mail.gmail.com>
From: Gregory Maxwell <gmaxwell@gmail.com>
To: Troy Benjegerdes <hozer@hozed.org>
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 <bitcoin-development@lists.sourceforge.net>
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: <bitcoin-development.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
<mailto:bitcoin-development-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development>
List-Post: <mailto:bitcoin-development@lists.sourceforge.net>
List-Help: <mailto:bitcoin-development-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/bitcoin-development>,
<mailto:bitcoin-development-request@lists.sourceforge.net?subject=subscribe>
X-List-Received-Date: Tue, 17 Dec 2013 22:48:21 -0000
On Tue, Dec 17, 2013 at 2:41 PM, Troy Benjegerdes <hozer@hozed.org> 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.
|
