X-Git-Url: http://xvm.mit.edu/gitweb/invirt/scripts/git-migration.git/blobdiff_plain/d79ec08f3fcc4078c41d571bfa2e91adec1c682c..492d83fe61f1afa3a14345414b38e6f13b42e6a6:/git-migrate

diff --git a/git-migrate b/git-migrate
index f10a512..909a604 100755
--- a/git-migrate
+++ b/git-migrate
@@ -32,13 +32,32 @@ def clonePackage(base, pkg):
                          stdout=subprocess.PIPE)
     p.wait()
     if len(p.stdout.read()) == 0:
-        subprocess.check_call(['git', 'reset', 'HEAD^'],
+        subprocess.check_call(['git', 'reset', '--soft', 'HEAD^'],
                               cwd='%s.git' % pkg)
 
 def cloneAllPackages(base):
     for pkg in open('package-list'):
         clonePackage(base, pkg.strip())
 
+def mergeHistory(old_pkg, new_pkg, n):
+    cwd = os.getcwd()
+    subprocess.check_call(['git', 'push',
+                           'file:///%s/%s.git' % (cwd, new_pkg),
+                           'master:refs/heads/%s' % old_pkg],
+                          cwd='%s.git' % old_pkg)
+
+def mergeHistories():
+    merges = []
+    for line in open('merges'):
+        line = line.strip()
+        if line == '' or line[0] == '#':
+            continue
+        
+        merges.append(line.split())
+    
+    for merge in merges:
+        mergeHistory(*merge)
+
 if __name__ == '__main__':
     try:
         base = sys.argv[1]
@@ -46,3 +65,4 @@ if __name__ == '__main__':
         base = 'svn://invirt.mit.edu/trunk'
     
     cloneAllPackages(base)
+    mergeHistories()