From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.bugs Subject: bug#69220: [PATCH] smerge-mode: add a function to resolve all conflicts in a file Date: Sat, 17 Feb 2024 13:16:14 +0300 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-1tGhaRw1K/ELi3lrR1ey" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38711"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Evolution 3.50.3 To: 69220@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 18 19:23:52 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rblpP-0009qS-9h for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Feb 2024 19:23:51 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rblpJ-0000nC-7Y; Sun, 18 Feb 2024 13:23:45 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rblpH-0000mQ-3m for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:23:43 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rblpG-0002vM-Rp for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:23:42 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblpb-0003HL-DL for bug-gnu-emacs@gnu.org; Sun, 18 Feb 2024 13:24:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Feb 2024 18:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69220 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170828059812200 (code B ref -1); Sun, 18 Feb 2024 18:24:03 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:23:18 +0000 Original-Received: from localhost ([127.0.0.1]:37168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rbloq-0003Ab-5c for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:23:17 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblR4-0001mW-WB for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:58:45 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbHk5-00018X-UV for bug-gnu-emacs@gnu.org; Sat, 17 Feb 2024 05:16:21 -0500 Original-Received: from forward100c.mail.yandex.net ([2a02:6b8:c03:500:1:45:d181:d100]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rbHk3-0008Lp-Ud for bug-gnu-emacs@gnu.org; Sat, 17 Feb 2024 05:16:21 -0500 Original-Received: from mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:448d:0:640:3464:0]) by forward100c.mail.yandex.net (Yandex) with ESMTPS id 1FA9F60032 for ; Sat, 17 Feb 2024 13:16:15 +0300 (MSK) Original-Received: by mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id EGLxZRBoGGk0-BkYeJXdM; Sat, 17 Feb 2024 13:16:14 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1708164974; bh=IJOofnndvFd4SSvsqJY6HAH3zSz8TF0jLn9B6JSREXQ=; h=Date:To:From:Subject:Message-ID; b=O7FGQZs3DWbE26tTMqRY6TUZTzA9Iszc5NOqpubHbXo2RJr69lAUqMXDDBoOiRMB5 qfUAtOWUfZZEspW/iNcCl4FGCNA6/zdiz1MUJzgZ7MRFdR7bcrYfqO1aQGZyGfjR0A 54q3MwmIwG93sgf9kLUhQH2SPENv79vv3vofuzcc= Authentication-Results: mail-nwsmtp-smtp-production-main-38.myt.yp-c.yandex.net; dkim=pass header.i=@yandex.ru Received-SPF: pass client-ip=2a02:6b8:c03:500:1:45:d181:d100; envelope-from=Hi-Angel@yandex.ru; helo=forward100c.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:280179 Archived-At: --=-1tGhaRw1K/ELi3lrR1ey Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This implements a feature request from here=C2=B9 about having a function t= o resolve all conflicts simultaneously. Although question author didn't reply, but either way I think it's a useful functional. I needed it so many times, but before stumbling upon this question I just didn't know there are functions `smerge-keep-upper/base/lower`, and so ofc I never though of writing a new one that would apply them to all conflicts. It might be useful to make a function to do the same within a git-repo, but for now let's have at least a function that does that within a file. 1: https://emacs.stackexchange.com/questions/80361/when-merging-conflicts-in-s= merge-mode-how-to-select-mine-for-all-conflicts --=-1tGhaRw1K/ELi3lrR1ey Content-Disposition: attachment; filename="1.patch" Content-Type: text/x-patch; name="1.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 RnJvbSAxNzAyZDdjMGY3ODJhOGUxOGIyNTM5MTk0YTViMjc2NzA3MTgxMzUzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBLb25zdGFudGluIEtoYXJsYW1vdiA8SGktQW5nZWxAeWFuZGV4 LnJ1PgpEYXRlOiBTYXQsIDE3IEZlYiAyMDI0IDEyOjQzOjAyICswMzAwClN1YmplY3Q6IFtQQVRD SF0gc21lcmdlLW1vZGU6IGFkZCBhIGZ1bmN0aW9uIHRvIHJlc29sdmUgYWxsIGNvbmZsaWN0cyBp biBhCiBmaWxlCgoqIGxpc3AvdmMvc21lcmdlLW1vZGUuZWwgKHNtZXJnZS1yZXNvbHZlLWFsbC1p bi1maWxlLXRvKTogYSBuZXcKaW50ZXJhY3RpdmUgZnVuY3Rpb24gdG8gcmVzb2x2ZSBhbGwgY29u ZmxpY3RzIGluIGEgZmlsZS4KLS0tCiBldGMvTkVXUyAgICAgICAgICAgICAgIHwgIDYgKysrKysr CiBsaXNwL3ZjL3NtZXJnZS1tb2RlLmVsIHwgMjEgKysrKysrKysrKysrKysrKysrKysrCiAyIGZp bGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0 Yy9ORVdTCmluZGV4IDliZGMzYWY1ZTcxLi5iN2E0ODQxMmY0ZiAxMDA2NDQKLS0tIGEvZXRjL05F V1MKKysrIGIvZXRjL05FV1MKQEAgLTExNzAsNiArMTE3MCwxMiBAQCBTaW1pbGFybHkgdG8gYnVm ZmVyIHJlc3RvcmF0aW9uIGJ5IERlc2t0b3AsICdyZWNlbnRmLW1vZGUnIGNoZWNraW5nCiBvZiB0 aGUgYWNjZXNzaWJpbGl0eSBvZiByZW1vdGUgZmlsZXMgY2FuIG5vdyB0aW1lIG91dCBpZgogJ3Jl bW90ZS1maWxlLW5hbWUtYWNjZXNzLXRpbWVvdXQnIGlzIHNldCB0byBhIHBvc2l0aXZlIG51bWJl ci4KIAorKiogU21lcmdlIG1vZGUKKworKioqIE5ldyBpbnRlcmFjdGl2ZSBmdW5jdGlvbiAnc21l cmdlLXJlc29sdmUtYWxsLWluLWZpbGUtdG8nLgorQWxsb3dzIHRvIHJlc29sdmUgYWxsIGNvbmZs aWN0cyBpbnNpZGUgYSBmaWxlIGluIHByZWZlcmVuY2Ugb2YgJ3VwcGVyJworb3IgJ2Jhc2UnIG9y ICdsb3dlcicuCisKICoqIE5vdGlmaWNhdGlvbnMKIAogKysrCmRpZmYgLS1naXQgYS9saXNwL3Zj L3NtZXJnZS1tb2RlLmVsIGIvbGlzcC92Yy9zbWVyZ2UtbW9kZS5lbAppbmRleCBhMTZjNzg3MWZm OS4uYzMyNDEwYmNiMTUgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvc21lcmdlLW1vZGUuZWwKKysrIGIv bGlzcC92Yy9zbWVyZ2UtbW9kZS5lbApAQCAtNzE0LDYgKzcxNCwyNyBAQCBzbWVyZ2Uta2VlcC11 cHBlcgogICAoc21lcmdlLWtlZXAtbiAxKQogICAoc21lcmdlLWF1dG8tbGVhdmUpKQogCisoZGVm dW4gc21lcmdlLXJlc29sdmUtYWxsLWluLWZpbGUtdG8gKHRvLWtlZXApCisgICJSZXNvbHZlcyBh bGwgY29uZmxpY3RzIGluc2lkZSBhIGZpbGUgaW4gcHJlZmVyZW5jZSBvZiBUTy1LRUVQLgorCitU Ty1LRUVQIGRlY2lkZXMgd2hpY2ggcGFydCB0byBrZWVwIGFuZCBpcyBvbmUgb2YgYHVwcGVyJywg YGJhc2UnLAorYGxvd2VyJyIuCisgIChpbnRlcmFjdGl2ZQorICAgKGxpc3QgKGNvbXBsZXRpbmct cmVhZCAiS2VlcGluZzogIiBbdXBwZXIgYmFzZSBsb3dlcl0pKSkKKyAgKGxldCAoKHJlc29sdmUt ZnVuYworICAgICAgICAgKHBjYXNlIHRvLWtlZXAKKyAgICAgICAgICAgKCJ1cHBlciIgJ3NtZXJn ZS1rZWVwLXVwcGVyKQorICAgICAgICAgICAoImJhc2UiICAnc21lcmdlLWtlZXAtYmFzZSkKKyAg ICAgICAgICAgKCJsb3dlciIgJ3NtZXJnZS1rZWVwLWxvd2VyKQorICAgICAgICAgICAoXyAoZXJy b3IgIlVua25vd24gcmVzb2x1dGlvbiBhcmd1bWVudCEiKSkpKQorICAgICAgICAobnVtLWNoYXJz LWJlZm9yZSAocG9pbnQtbWF4KSkpCisgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAoZ290by1j aGFyIChwb2ludC1taW4pKQorICAgICAgKHdoaWxlIChpZ25vcmUtZXJyb3JzIChub3QgKHNtZXJn ZS1uZXh0KSkpCisgICAgICAgIChmdW5jYWxsIHJlc29sdmUtZnVuYykpKQorICAgICh3aGVuICg9 IG51bS1jaGFycy1iZWZvcmUgKHBvaW50LW1heCkpCisgICAgICAobWVzc2FnZSAiTm8gY29uZmxp Y3RzIHdlcmUgZm91bmQiKSkpKQorCiAoZGVmaW5lLW9ic29sZXRlLWZ1bmN0aW9uLWFsaWFzICdz bWVyZ2Uta2VlcC1taW5lICdzbWVyZ2Uta2VlcC11cHBlciAiMjYuMSIpCiAKIChkZWZ1biBzbWVy Z2UtZ2V0LWN1cnJlbnQgKCkKLS0gCjIuNDMuMAoK --=-1tGhaRw1K/ELi3lrR1ey--