1 Return-Path: <tomi.ollila@iki.fi>
\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 7001C431FB6
\r
6 for <notmuch@notmuchmail.org>; Tue, 17 Apr 2012 14:00:59 -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 HVeiD16+jYoW for <notmuch@notmuchmail.org>;
\r
16 Tue, 17 Apr 2012 14:00:54 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
\r
18 by olra.theworths.org (Postfix) with ESMTP id B5028431FAE
\r
19 for <notmuch@notmuchmail.org>; Tue, 17 Apr 2012 14:00:54 -0700 (PDT)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 937F168055; Wed, 18 Apr 2012 00:00:49 +0300 (EEST)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: david@tethera.net, notmuch@notmuchmail.org
\r
24 Subject: Re: [PATCH] contrib/nmbug: use "resolve" merge strategy
\r
25 In-Reply-To: <1333195960-31359-1-git-send-email-david@tethera.net>
\r
26 References: <1333195960-31359-1-git-send-email-david@tethera.net>
\r
27 User-Agent: Notmuch/0.12+113~gde05574 (http://notmuchmail.org) Emacs/23.3.1
\r
28 (x86_64-unknown-linux-gnu)
\r
29 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
30 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
31 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
32 Date: Wed, 18 Apr 2012 00:00:49 +0300
\r
33 Message-ID: <m21unm9ipq.fsf@guru.guru-group.fi>
\r
35 Content-Type: text/plain; charset=us-ascii
\r
36 Cc: David Bremner <bremner@debian.org>
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Tue, 17 Apr 2012 21:00:59 -0000
\r
51 On Sat, Mar 31 2012, david@tethera.net wrote:
\r
53 > From: David Bremner <bremner@debian.org>
\r
55 > The recursive merge strategy does rename detection, which yields false
\r
56 > positives (and hence spurious merge conflicts) when merging trees of
\r
59 I attempted to search more info about 'recursive' vs 'resolve' merge
\r
60 but without much luck. Nothing better comes out than MERGE STRATEGIES
\r
61 section in git-merge namual page.
\r
63 IMHO text favoring resolve: "It tries to carefully detect criss-cross
\r
64 merge ambiguities and is considered generally safe and fast."
\r
66 & text unfavoring recursive (in this particular case): "Additionally
\r
67 this can detect and handle merges involving renames."
\r
74 > An unresolved issue (ho ho) is the fact that failed merge operations
\r
75 > are still not detected. This needs more thought, but I thought this
\r
76 > patch might save people some pain in the meantime. It isn't very heavily
\r
79 > contrib/nmbug | 2 +-
\r
80 > 1 files changed, 1 insertions(+), 1 deletions(-)
\r
82 > diff --git a/contrib/nmbug b/contrib/nmbug
\r
83 > index bb0739f..0ed3c29 100755
\r
84 > --- a/contrib/nmbug
\r
85 > +++ b/contrib/nmbug
\r
86 > @@ -302,7 +302,7 @@ sub do_merge {
\r
88 > git ( { GIT_WORK_TREE => $tempwork }, 'checkout', '-f', 'HEAD');
\r
90 > - git ( { GIT_WORK_TREE => $tempwork }, 'merge', 'FETCH_HEAD');
\r
91 > + git ( { GIT_WORK_TREE => $tempwork }, 'merge', '-s', 'resolve', 'FETCH_HEAD');
\r
98 > _______________________________________________
\r
99 > notmuch mailing list
\r
100 > notmuch@notmuchmail.org
\r
101 > http://notmuchmail.org/mailman/listinfo/notmuch
\r