From 5aecd325549fe2acf31df0e1591f2796aad80dfd Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 18 Apr 2017 16:33:07 -0400
Subject: [PATCH] merge.sh file for the repo merge

---
 merge.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 merge.sh

diff --git a/merge.sh b/merge.sh
new file mode 100644
index 000000000..9d2629bfb
--- /dev/null
+++ b/merge.sh
@@ -0,0 +1,53 @@
+#! /bin/bash
+set -e
+
+# NOTE: go-alert depends on go-common
+
+REPOS=("autofile" "clist" "db" "events" "flowrate" "logger" "process")
+
+mkdir common
+git mv *.go common
+git mv LICENSE common
+
+git commit -m "move all files to common/ to begin repo merge"
+
+for repo in "${REPOS[@]}"; do 
+	# add and fetch the repo
+	git remote add -f "$repo" "https://github.com/tendermint/go-${repo}"
+
+	# merge master and move into subdir
+	git merge "$repo/master" --no-edit
+
+	if [[ "$repo" != "flowrate" ]]; then
+		mkdir "$repo"
+		git mv *.go "$repo/"
+	fi
+
+	set +e # these might not exist
+        git mv *.md "$repo/"
+	git mv README "$repo/README.md"
+	git mv Makefile "$repo/Makefile"
+        git rm LICENSE
+	set -e
+        
+	# commit
+	git commit -m "merge go-${repo}"
+
+	git remote rm "$repo"
+done
+
+go get github.com/ebuchman/got
+got replace "tendermint/go-common" "tendermint/go-common/common"
+for repo in "${REPOS[@]}"; do 
+
+	if [[ "$repo" != "flowrate" ]]; then
+		got replace "tendermint/go-${repo}" "tendermint/go-common/${repo}"
+	else
+		got replace "tendermint/go-${repo}/flowrate" "tendermint/go-common/flowrate"
+	fi
+done
+
+git add -u 
+git commit -m "update import paths"
+
+# TODO: change any paths in non-Go files