[PATCH] contrib/nmbug: use "resolve" merge strategy

diff --git a/33/a7f9846bb4759772e8b454bd225e095db690b8 b/33/a7f9846bb4759772e8b454bd225e095db690b8
new file mode 100644 (file)
index 0000000..b318ce5
--- /dev/null
+++ b/33/a7f9846bb4759772e8b454bd225e095db690b8
@@ -0,0 +1,81 @@
+Return-Path: <bremner@tethera.net>\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 A547A431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 05:12:54 -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 1hEn23Op3A7r for <notmuch@notmuchmail.org>;\r
+       Sat, 31 Mar 2012 05:12:54 -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 2CF13431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 05:12:54 -0700 (PDT)\r
+Received: from fctnnbsc30w-142166230117.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.166.230.117] 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@tethera.net>)\r
+       id 1SDxAq-000496-Vy; Sat, 31 Mar 2012 09:12:53 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.77)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1SDxAl-0008AZ-Lu; Sat, 31 Mar 2012 09:12:47 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib/nmbug: use "resolve" merge strategy\r
+Date: Sat, 31 Mar 2012 09:12:40 -0300\r
+Message-Id: <1333195960-31359-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.9.1\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\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: Sat, 31 Mar 2012 12:12:54 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The recursive merge strategy does rename detection, which yields false\r
+positives (and hence spurious merge conflicts) when merging trees of\r
+empty files.\r
+---\r
+ An unresolved issue (ho ho) is the fact that failed merge operations\r
+ are still not detected. This needs more thought, but I thought this \r
+ patch might save people some pain in the meantime. It isn't very heavily \r
+ tested, though.\r
+\r
+ contrib/nmbug |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/contrib/nmbug b/contrib/nmbug\r
+index bb0739f..0ed3c29 100755\r
+--- a/contrib/nmbug\r
++++ b/contrib/nmbug\r
+@@ -302,7 +302,7 @@ sub do_merge {\r
+ \r
+   git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD');\r
+ \r
+-  git ( { GIT_WORK_TREE => $tempwork }, 'merge', 'FETCH_HEAD');\r
++  git ( { GIT_WORK_TREE => $tempwork }, 'merge', '-s', 'resolve', 'FETCH_HEAD');\r
+ \r
+   do_checkout ();\r
+ }\r
+-- \r
+1.7.9.1\r
+\r