From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_C,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id F1C301F5AE for ; Fri, 24 Jul 2020 00:58:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgGXA6k (ORCPT ); Thu, 23 Jul 2020 20:58:40 -0400 Received: from pb-smtp2.pobox.com ([64.147.108.71]:64605 "EHLO pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728394AbgGXA6j (ORCPT ); Thu, 23 Jul 2020 20:58:39 -0400 Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 8389C80B08; Thu, 23 Jul 2020 20:58:37 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:message-id:mime-version:content-type :content-transfer-encoding; s=sasl; bh=qquFlAIeOLvqUGrx6NdCKmG0x EA=; b=XbrCQFcrDvRGnc6wc5blTpT9RSutqkmGP50qRTaOzrecK/msHanUiqJND WVc/IvHyq9+i0xPVzW+cxXNFrZH1ZamWjXFGikBnBNM72oxRlBmjmllUp6mh3aqP LrqL4L7Y6jZdH2C+ceUh/SOOI+YMzMK83eP4CUm2k6Qh0tBxeE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=sasl; b=vTNh6rkGouxzDKrMP4J ulNi3oCe5zazkLpWt3LizVNh0/PJWa1G+3xBQlIA0PzJH5WxwRyt6fyV2ebQunBh nOwPy4jxeuqFFu6TR0JzlqcA2Gd3SP+kVLRcGlORfDq7qEGWm7DcWTqwWIUJv04S f32pyHs8LT4moBJtHDBhqeZ4= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 79EC380B07; Thu, 23 Jul 2020 20:58:37 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id F18C180B06; Thu, 23 Jul 2020 20:58:36 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "sunlin via GitGitGadget" Cc: git@vger.kernel.org, sunlin , Lin Sun Subject: Re: [PATCH v17] Support auto-merge for meld to follow the vim-diff behavior References: Date: Thu, 23 Jul 2020 17:58:36 -0700 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Pobox-Relay-ID: CE42DFE4-CD48-11EA-A0EC-2F5D23BA3BAF-77302942!pb-smtp2.pobox.com Content-Transfer-Encoding: quoted-printable Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "sunlin via GitGitGadget" writes: > From: Lin Sun > > Make the mergetool used with "meld" backend behave similarly to "vimdif= f" by > telling it to auto-merge non-conflicting parts and highlight the confli= cting > parts when `mergetool.meld.useAutoMerge` is configured with `true`, or = `auto` > for detecting the `--auto-merge` option automatically. > > Helped-by: =C4=90o=C3=A0n Tr=E1=BA=A7n C=C3=B4ng Danh > Helped-by: David Aguilar > Signed-off-by: Lin Sun > Signed-off-by: Junio C Hamano > --- > Enable auto-merge for meld to follow the vimdiff beharior > =20 > Hi, the mergetool "meld" does NOT merge the no-conflict changes, wh= ile > the mergetool "vimdiff" will merge the no-conflict changes and high= light > the conflict parts. This patch will make the mergetool "meld" simil= ar to > "vimdiff", auto-merge the no-conflict changes, highlight conflict p= arts. This version seems to revert the bool-or-str change that would become useful with a bit more polishing, with docs and tests. Intended? It also seems to repeat many issues that have been pointed out during the reviews of previous revisions. I'd rather not have to repeat pointing them out all over again, obviously. I have queued v16 (the one with the beginning of bool-or-str) with minimum fixups for issues I pointed out in the review of that revision queued on top of it as SQUASH??? commit. Please find it in the 'seen' branch. Also, Subject: Support auto-merge for meld to follow the vim-diff behavior needs fixing. cf. https://git-scm.com/docs/SubmittingPatches#describe-changes Two tricks to pick a good title are: - Read a pageful or two of "git shortlog --no-merges" output to get accustomed to the general pattern in the entire project. It would become clear why titles with "area:" prefix help the patches with them easier to locate. - Read a pageful of "git shortlog --no-merges -- mergetools" (i.e. the same but limited to the files you are touching) to see how the changes that contributed over time to build the subsystem are called, so that the new patches can fit in the pattern. I think something along the lines of Subject: [PATCH] mergetool/meld: optionally allow --auto-merge behavi= our or something would fit well. Thanks.