From f1b49f6a4fc382196dc98159a23b32549b740c8b Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 18 Apr 2012 00:00:49 +0300 Subject: [PATCH] Re: [PATCH] contrib/nmbug: use "resolve" merge strategy --- d8/779a6f52a4bdada8f98e232c8dda15a6e764ee | 101 ++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 d8/779a6f52a4bdada8f98e232c8dda15a6e764ee diff --git a/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee b/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee new file mode 100644 index 000000000..ec611d629 --- /dev/null +++ b/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee @@ -0,0 +1,101 @@ +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 7001C431FB6 + for ; Tue, 17 Apr 2012 14:00:59 -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 HVeiD16+jYoW for ; + Tue, 17 Apr 2012 14:00:54 -0700 (PDT) +Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) + by olra.theworths.org (Postfix) with ESMTP id B5028431FAE + for ; Tue, 17 Apr 2012 14:00:54 -0700 (PDT) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 937F168055; Wed, 18 Apr 2012 00:00:49 +0300 (EEST) +From: Tomi Ollila +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [PATCH] contrib/nmbug: use "resolve" merge strategy +In-Reply-To: <1333195960-31359-1-git-send-email-david@tethera.net> +References: <1333195960-31359-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.12+113~gde05574 (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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: Tue, 17 Apr 2012 21:00:59 -0000 + +On Sat, Mar 31 2012, david@tethera.net wrote: + +> 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. + +I attempted to search more info about 'recursive' vs 'resolve' merge +but without much luck. Nothing better comes out than MERGE STRATEGIES +section in git-merge namual page. + +IMHO text favoring resolve: "It tries to carefully detect criss-cross +merge ambiguities and is considered generally safe and fast." + +& text unfavoring recursive (in this particular case): "Additionally +this can detect and handle merges involving renames." + +so LGTM. + +Tomi + +> --- +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2