Re: [PATCH] nmbug: check whether every forked process exit with (non)zero value

diff --git a/cb/b8880b7651a8d88e16a55db60f44c5b89c7254 b/cb/b8880b7651a8d88e16a55db60f44c5b89c7254
new file mode 100644 (file)
index 0000000..10e5588
--- /dev/null
+++ b/cb/b8880b7651a8d88e16a55db60f44c5b89c7254
@@ -0,0 +1,70 @@
+Return-Path: <bremner@unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E8DC5431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:56:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id yfwPRYqtfVXi for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jun 2012 09:56:24 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 76C79431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:56:24 -0700 (PDT)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)\r
+       (Exim 4.72) (envelope-from <bremner@unb.ca>)\r
+       id 1SbE6J-0000TF-HX; Sun, 03 Jun 2012 13:56:23 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1SbE6E-0003MX-8L; Sun, 03 Jun 2012 13:56:18 -0300\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] nmbug: check whether every forked process exit with\r
+       (non)zero value\r
+In-Reply-To: <1333304922-30681-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1333195960-31359-1-git-send-email-david@tethera.net>\r
+       <1333304922-30681-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.13.2 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 03 Jun 2012 13:56:18 -0300\r
+Message-ID: <878vg4wczx.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Spam_bar: -\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 03 Jun 2012 16:56:25 -0000\r
+\r
+Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+\r
+> If any of the forked process exits with nonzero value, terminate\r
+> current operation -- nonzero exit value indicates failure and\r
+> then there is no point continuing.\r
+\r
+Pushed.\r
+\r
+Ironically I'm still not too sure about the merge strategy thing, I hope\r
+I have some time to test it more, but at the moment I forget how to\r
+reliable get a conflict.\r
+\r
+d\r