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

Fixes mapmerge (#60143)

Browse Source 
Fixes a condition where mapmerge would fail converting/detecting non tgm maps
This commit is contained in:
Letter N
2021-07-11 23:16:30 -07:00
committed by GitHub
parent c0409b5a8e
commit 08a7b9d9fd
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]