Start by pushing revisions around as necessary for merging.

svn path=/trunk/scripts/git-migration/; revision=1881

diff --git a/git-migrate b/git-migrate
index edd916c..b79053a 100755 (executable)
--- a/git-migrate
+++ b/git-migrate
@@ -40,7 +40,11 @@ def cloneAllPackages(base):
         clonePackage(base, pkg.strip())
 
 def mergeHistory(old_pkg, new_pkg, n):
-    pass
+    cwd = os.getcwd()
+    subprocess.check_call(['git', 'push',
+                           'file:///%s/%s.git' % (cwd, new_pkg),
+                           'master:refs/heads/%s' % old_pkg],
+                          cwd=new_pkg)
 
 def mergeHistories():
     for line in open('grafts'):