From 6b1a7eb89a6f8c47babf62e94ce7572fb2849c95 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 1 Apr 2012 09:12:40 +2100 Subject: [PATCH] [PATCH] contrib/nmbug: use "resolve" merge strategy --- 33/a7f9846bb4759772e8b454bd225e095db690b8 | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 33/a7f9846bb4759772e8b454bd225e095db690b8 diff --git a/33/a7f9846bb4759772e8b454bd225e095db690b8 b/33/a7f9846bb4759772e8b454bd225e095db690b8 new file mode 100644 index 000000000..b318ce58c --- /dev/null +++ b/33/a7f9846bb4759772e8b454bd225e095db690b8 @@ -0,0 +1,81 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id A547A431FAF + for ; Sat, 31 Mar 2012 05:12:54 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 1hEn23Op3A7r for ; + Sat, 31 Mar 2012 05:12:54 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2CF13431FAE + for ; Sat, 31 Mar 2012 05:12:54 -0700 (PDT) +Received: from fctnnbsc30w-142166230117.dhcp-dynamic.fibreop.nb.bellaliant.net + ([142.166.230.117] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) + (Exim 4.72) (envelope-from ) + id 1SDxAq-000496-Vy; Sat, 31 Mar 2012 09:12:53 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.77) + (envelope-from ) + id 1SDxAl-0008AZ-Lu; Sat, 31 Mar 2012 09:12:47 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] contrib/nmbug: use "resolve" merge strategy +Date: Sat, 31 Mar 2012 09:12:40 -0300 +Message-Id: <1333195960-31359-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.9.1 +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 31 Mar 2012 12:12:54 -0000 + +From: David Bremner + +The recursive merge strategy does rename detection, which yields false +positives (and hence spurious merge conflicts) when merging trees of +empty files. +--- + An unresolved issue (ho ho) is the fact that failed merge operations + are still not detected. This needs more thought, but I thought this + patch might save people some pain in the meantime. It isn't very heavily + tested, though. + + contrib/nmbug | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/contrib/nmbug b/contrib/nmbug +index bb0739f..0ed3c29 100755 +--- a/contrib/nmbug ++++ b/contrib/nmbug +@@ -302,7 +302,7 @@ sub do_merge { + + git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD'); + +- git ( { GIT_WORK_TREE => $tempwork }, 'merge', 'FETCH_HEAD'); ++ git ( { GIT_WORK_TREE => $tempwork }, 'merge', '-s', 'resolve', 'FETCH_HEAD'); + + do_checkout (); + } +-- +1.7.9.1 + -- 2.26.2