From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3AB615802E for ; Mon, 24 Jun 2024 18:05:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E227F2BC0A0; Mon, 24 Jun 2024 18:05:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BD2F2BC0AC for ; Mon, 24 Jun 2024 18:05:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3232A335CAF for ; Mon, 24 Jun 2024 18:05:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99C9A1D34 for ; Mon, 24 Jun 2024 18:05:17 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1717772563.3cded564f41736854cd41c6e5c2318f4a7351d7f.mattst88@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: bin/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/merge-driver-ekeyword X-VCS-Directories: bin/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3cded564f41736854cd41c6e5c2318f4a7351d7f X-VCS-Branch: master Date: Mon, 24 Jun 2024 18:05:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 88a1d588-892e-40c7-bd48-541ea5ff4c25 X-Archives-Hash: 76d1bcee9334046022e81744a0ac7f3b commit: 3cded564f41736854cd41c6e5c2318f4a7351d7f Author: Matt Turner gentoo org> AuthorDate: Tue May 28 02:26:23 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri Jun 7 15:02:43 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=3cded564 bin/merge-driver-ekeyword: Store merged output in correct location Fixes: a667d93 ("bin/merge-driver-ekeyword: Look for KEYWORDS changes in upstream commit") Signed-off-by: Matt Turner gentoo.org> bin/merge-driver-ekeyword | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index 6d5f869..70c9b3a 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -11,6 +11,7 @@ See https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver import difflib import os +import shutil import sys import tempfile @@ -128,6 +129,8 @@ def main(argv: Sequence[str]) -> int: elif changes := keyword_changes(O, A): # Apply %O -> %A changes to %B result = apply_keyword_changes(B, P, changes) + # Merged file should be left in %A + shutil.move(B, A) sys.exit(result) else: try: