cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes mapmerge (#6863)

Browse Source 
* Fixes mapmerge (#60143)

Fixes a condition where mapmerge would fail converting/detecting non tgm maps

* Fixes mapmerge

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-12 21:47:25 +01:00
committed by GitHub
co-authored by Letter N
parent fb4284e779
commit cba9c59cb8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/mapmerge2/convert.py
+1 -1
View File
@@ -4,4 +4,4 @@ from . import frontend, dmm
if __name__ == '__main__':
settings = frontend.read_settings()
for fname in frontend.process(settings, "convert"):
dmm.DMM.from_file(fname).to_file(fname, settings.tgm)
dmm.DMM.from_file(fname).to_file(fname, tgm = settings.tgm)
tools/mapmerge2/fixup.py
+1 -1
View File
@@ -96,7 +96,7 @@ def main(repo):
converted[path] = merge_map(head_files[path], dmm.DMM.from_bytes(data))
if len(working_commit.parents) != 1:
print("A merge commit was encountered before good versions of these maps were found:")
print("\n".join(f" {x}" for x in head_files.keys() - base_files.keys()))
print("\n".join(f" {x}" for x in head_files.keys() - converted.keys()))
return 1
working_commit = working_commit.parents[0]