1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A547A431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 05:12:54 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 1hEn23Op3A7r for <notmuch@notmuchmail.org>;
\r
16 Sat, 31 Mar 2012 05:12:54 -0700 (PDT)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 2CF13431FAE
\r
21 for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 05:12:54 -0700 (PDT)
\r
22 Received: from fctnnbsc30w-142166230117.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.166.230.117] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
\r
25 (Exim 4.72) (envelope-from <bremner@tethera.net>)
\r
26 id 1SDxAq-000496-Vy; Sat, 31 Mar 2012 09:12:53 -0300
\r
27 Received: from bremner by zancas.localnet with local (Exim 4.77)
\r
28 (envelope-from <bremner@tethera.net>)
\r
29 id 1SDxAl-0008AZ-Lu; Sat, 31 Mar 2012 09:12:47 -0300
\r
30 From: david@tethera.net
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] contrib/nmbug: use "resolve" merge strategy
\r
33 Date: Sat, 31 Mar 2012 09:12:40 -0300
\r
34 Message-Id: <1333195960-31359-1-git-send-email-david@tethera.net>
\r
35 X-Mailer: git-send-email 1.7.9.1
\r
37 Cc: David Bremner <bremner@debian.org>
\r
38 X-BeenThere: notmuch@notmuchmail.org
\r
39 X-Mailman-Version: 2.1.13
\r
41 List-Id: "Use and development of the notmuch mail system."
\r
42 <notmuch.notmuchmail.org>
\r
43 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
45 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
46 List-Post: <mailto:notmuch@notmuchmail.org>
\r
47 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
48 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
50 X-List-Received-Date: Sat, 31 Mar 2012 12:12:54 -0000
\r
52 From: David Bremner <bremner@debian.org>
\r
54 The recursive merge strategy does rename detection, which yields false
\r
55 positives (and hence spurious merge conflicts) when merging trees of
\r
58 An unresolved issue (ho ho) is the fact that failed merge operations
\r
59 are still not detected. This needs more thought, but I thought this
\r
60 patch might save people some pain in the meantime. It isn't very heavily
\r
63 contrib/nmbug | 2 +-
\r
64 1 files changed, 1 insertions(+), 1 deletions(-)
\r
66 diff --git a/contrib/nmbug b/contrib/nmbug
\r
67 index bb0739f..0ed3c29 100755
\r
70 @@ -302,7 +302,7 @@ sub do_merge {
\r
72 git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD');
\r
74 - git ( { GIT_WORK_TREE => $tempwork }, 'merge', 'FETCH_HEAD');
\r
75 + git ( { GIT_WORK_TREE => $tempwork }, 'merge', '-s', 'resolve', 'FETCH_HEAD');
\r