From: Evan Broder <broder@mit.edu>
Date: Wed, 24 Dec 2008 22:46:15 +0000 (-0500)
Subject: Start by pushing revisions around as necessary for merging.
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/commitdiff_plain/28c4d680f6f0c02ae58385c04250f244dc605ec3?ds=sidebyside

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
--- 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'):