Add files necessary to merge proto repositories togetherHEADmaster

1 files changed, 20 insertions, 0 deletions

diff --git a/merge-proto b/merge-proto
new file mode 100755
index 0000000..6779e8f
--- /dev/null
+++ b/merge-proto
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+mkdir proto && (cd proto && git init) || exit 1
+mkdir oldproto || exit 1
+
+for i in "$@"; do
+    (cd oldproto &&
+    git clone git://anongit.freedesktop.org/git/xorg/proto/$i
+    (cd $i &&
+    mkdir $i &&
+    for j in `git ls-files | sed 's;/.*;;' | sort -u`; do
+    	git mv $j $i/$j
+    done &&
+    git commit -s -m"Move $i files to their sub-directory")) &&
+    (cd proto &&
+    git remote add $i ../oldproto/$i &&
+    git fetch $i &&
+    git merge $i/master) || exit 1
+done
+