diff options
| author | Matt Turner <mattst88@gentoo.org> | 2024-05-27 22:26:23 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2024-06-07 11:02:43 -0400 |
| commit | 3cded564f41736854cd41c6e5c2318f4a7351d7f (patch) | |
| tree | aca8bba5598efdbad1c45f3976c8df0d43c57690 | |
| parent | e0e7c2e9119fda47a10bc882a976000a08994f0d (diff) | |
| download | gentoolkit-3cded564f41736854cd41c6e5c2318f4a7351d7f.tar.gz | |
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 <mattst88@gentoo.org>
| -rwxr-xr-x | bin/merge-driver-ekeyword | 3 |
1 files changed, 3 insertions, 0 deletions
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: |