Merge pull request #4790 from Citadel-Station-13/upstream-merge-34361

[MIRROR] Fix the batch file method of mapmerge2 and save a .before
2018-01-12 17:48:36 +00:00
parent 391fc06f01 f323ded1f7
commit 5bb87e6778
1 changed files with 2 additions and 1 deletions
@@ -85,9 +85,10 @@ def merge_map(new_map, old_map, delete_unused=False):

 def main(settings):
    for fname in frontend.process(settings, "merge", backup=True):
+        shutil.copyfile(fname, fname + ".before")
        old_map = DMM.from_file(fname + ".backup")
        new_map = DMM.from_file(fname)
-        merge_map(old_map, new_map).to_file(fname, settings.tgm)
+        merge_map(new_map, old_map).to_file(fname, settings.tgm)

 if __name__ == '__main__':
    main(frontend.read_settings())