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

diff --git a/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee b/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee
new file mode 100644 (file)
index 0000000..ec611d6
--- /dev/null
+++ b/d8/779a6f52a4bdada8f98e232c8dda15a6e764ee
@@ -0,0 +1,101 @@
+Return-Path: <tomi.ollila@iki.fi>\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 7001C431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 17 Apr 2012 14:00:59 -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 HVeiD16+jYoW for <notmuch@notmuchmail.org>;\r
+       Tue, 17 Apr 2012 14:00:54 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])\r
+       by olra.theworths.org (Postfix) with ESMTP id B5028431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 17 Apr 2012 14:00:54 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 937F168055; Wed, 18 Apr 2012 00:00:49 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] contrib/nmbug: use "resolve" merge strategy\r
+In-Reply-To: <1333195960-31359-1-git-send-email-david@tethera.net>\r
+References: <1333195960-31359-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.12+113~gde05574 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Wed, 18 Apr 2012 00:00:49 +0300\r
+Message-ID: <m21unm9ipq.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 17 Apr 2012 21:00:59 -0000\r
+\r
+On Sat, Mar 31 2012, david@tethera.net wrote:\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
+I attempted to search more info about 'recursive' vs 'resolve' merge\r
+but without much luck. Nothing better comes out than MERGE STRATEGIES\r
+section in git-merge namual page.\r
+\r
+IMHO text favoring resolve: "It tries to carefully detect criss-cross\r
+merge ambiguities and is considered generally safe and fast."\r
+\r
+& text unfavoring recursive (in this particular case): "Additionally\r
+this can detect and handle merges involving renames."\r
+\r
+so LGTM.\r
+\r
+Tomi\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r