testserver/scripts/upstreamMerge.sh

#!/usr/bin/env bash

PS1="$"
basedir=$(realpath "$1")
workdir="$basedir/work"

function update {
    cd "$workdir/$1"
    git fetch && git reset --hard origin/master
    cd ../
    git add $1
}

update Bukkit
update CraftBukkit
update Spigot
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`#!/usr/bin/env bash`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00
			`PS1="$"`
Rebuild patches after we continue from a paper edit. 2016-04-02 23:34:27 +00:00			`basedir=$(realpath "$1")`
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`workdir="$basedir/work"`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00
			`function update {`
Cleanup and restructure the project 2016-04-02 03:55:54 +00:00			`cd "$workdir/$1"`
Add upstreamMerge.sh and update CB submodule 2016-01-26 06:04:43 +00:00			`git fetch && git reset --hard origin/master`
			`cd ../`
			`git add $1`
			`}`

			`update Bukkit`
			`update CraftBukkit`
Update upstream Spigot and upstreamMerge script Also remove paperclip from upstream merge, it shouldn't need merging very often 2016-03-21 17:32:05 +00:00			`update Spigot`