projects
/
invirt/scripts/git-migration.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start by pushing revisions around as necessary for merging.
[invirt/scripts/git-migration.git]
/
git-migrate
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):
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'):
def mergeHistories():
for line in open('grafts'):