cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up unused merge things

Browse Source
This commit is contained in:
Arokha Sieyes
2018-10-06 12:32:41 -04:00
parent 8c2e0928fa
commit dd7c6533a5
14 changed files with 0 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/mapmerge/1prepare_map.bat
View File

@@ -1,7 +0,0 @@
cd ../../maps/tether
FOR %%f IN (*.dmm) DO (
copy %%f %%f.backup
)
pause

8
tools/mapmerge/2clean_map.bat
View File

@@ -1,8 +0,0 @@
SET z_levels=10
cd
FOR %%f IN (../../maps/tether/*.dmm) DO (
java -jar MapPatcher.jar -clean ../../maps/tether/%%f.backup ../../maps/tether/%%f ../../maps/tether/%%f
)
pause

BIN
tools/mapmerge/MapPatcher.jar
View File

Binary file not shown.

9
tools/mapmerge/clean_map_git.sh
View File

@@ -1,9 +0,0 @@
#!/bin/sh
for MAPFILE in ../../maps/*.dmm
do
MAPNAME=$(basename $MAPFILE)
git show HEAD:maps/$MAPNAME > tmp.dmm
java -jar MapPatcher.jar -clean tmp.dmm $MAPFILE $MAPFILE
rm tmp.dmm
done

6
tools/mapmerge/git_merge_installer.bat
View File

@@ -1,6 +0,0 @@
@echo off
set tab=
echo. >> ../../.git/config
echo [merge "merge-dmm"] >> ../../.git/config
echo %tab%name = mapmerge driver >> ../../.git/config
echo %tab%driver = ./tools/mapmerge/mapmerge.sh %%O %%A %%B >> ../../.git/config

6
tools/mapmerge/git_merge_installer.sh
View File

@@ -1,6 +0,0 @@
F="../../.git/config"
echo '' >> $F
echo '[merge "merge-dmm"]' >> $F
echo ' name = mapmerge driver' >> $F
echo ' driver = ./tools/mapmerge/mapmerge.sh %O %A %B' >> $F

19
tools/mapmerge/install.txt
View File

@@ -1,19 +0,0 @@
1. Install java(http://www.java.com/en/download/index.jsp)
2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).
Committing
1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory.
2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.
Merging
The easiest way to do merging is to install the merge driver. For this, open `Baystation12/.git/config` in a text editor, and paste the following lines to the end of it:
[merge "merge-dmm"]
name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.

9
tools/mapmerge/mapmerge.sh
View File

@@ -1,9 +0,0 @@
java -jar tools/mapmerge/MapPatcher.jar -merge $1 $2 $3 $2
if [ "$?" -gt 0 ]
then
echo "Unable to automatically resolve map conflicts, please merge manually."
exit 1
fi
java -jar tools/mapmerge/MapPatcher.jar -clean $3 $2 $2
exit 0