Add upmerge script

Author: sirnacnud

Git/podspec-merge-driver.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+import difflib
+import sys
+
+def extract_hunks(unified_diff):
+	hunks = []
+	hunk = []
+
+	for diff in unified_diff:
+		# Strip out all whitespace characters
+		line = "".join(diff.split())
+
+		if line == '---' or line == '+++':
+			continue
+		elif line.startswith('@@'):
+			if len(hunk) > 0 :
+				hunks.append(hunk)
+				hunk = []
+		else:
+			hunk.append(line)
+
+	if len(hunk) > 0:
+		hunks.append(hunk)		
+
+	return hunks
+
+def check_for_only_version_change(hunks):
+	# If only version is changed, we will have only one hunk
+	if len(hunks) > 1:
+		return False
+
+	hunk = hunks[0]
+
+	# Make sure the hunk only contains the version change
+	for line in hunk:
+		if not '.version=' in line:
+			return False
+
+	return True
+
+
+# Create unified diff between ancestor podpsec and other
+diff = difflib.unified_diff(open(sys.argv[1]).readlines() ,open(sys.argv[3]).readlines(), n=0)
+hunks = extract_hunks(diff)
+
+if check_for_only_version_change(hunks) == True:
+	# If only versions are different, we will just take the current version
+	sys.exit(0)
+else:
+	# Other differences require manual merge
+	sys.exit(1)

Git/upmerge.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ "$#" -ne 2 ]; then
+    echo "Wrong number of parameters, should be <source branch> <destination branch>. Example: ./upmerge.sh 12.2 13.2"
+    exit 1
+fi
+
+if [[ -n $(git status -s) ]]; then
+ 	echo "Git tree is dirty, please commit changes before upmerging"
+ 	exit 1
+fi
+
+git checkout origin/$2/master
+
+git checkout -b $2/upmerge
+
+git config merge.ours-driver.driver true
+git config merge.podspec-merge-driver.driver "./Submodules/SMF-iOS-CommonProjectSetupFiles/Git/podspec-merge-driver.py %O %A %B"
+
+git merge origin/$1/master --no-edit
+
+git config --unset merge.ours-driver.driver
+git config --unset merge.podspec-merge-driver