From ffcef9bdd3a5ebba7e16447d3025662656e70f05 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Wed, 24 Dec 2008 18:20:39 -0500 Subject: [PATCH 1/1] Grafts is a poor name for the list of merges. Let's call it merges instead. svn path=/trunk/scripts/git-migration/; revision=1884 --- git-migrate | 14 +++++++------- grafts => merges | 0 2 files changed, 7 insertions(+), 7 deletions(-) rename grafts => merges (100%) diff --git a/git-migrate b/git-migrate index f259f54..796f937 100755 --- a/git-migrate +++ b/git-migrate @@ -81,16 +81,16 @@ def mergeHistory(old_pkg, new_pkg, n): print >>f, ' '.join(graft) def mergeHistories(): - grafts = [] - for line in open('grafts'): + merges = [] + for line in open('merges'): line = line.strip() if line[0] == '#' or line == '': continue - grafts.append(line.split()) + merges.append(line.split()) - for graft in grafts: - mergeHistory(*graft) + for merge in merges: + mergeHistory(*merge) for line in open('package-list'): line = line.strip() @@ -99,8 +99,8 @@ def mergeHistories(): '--all'], cwd='%s.git' % line) - for graft in grafts: - shutil.rmtree('%s.git' % graft[0]) + for merge in merges: + shutil.rmtree('%s.git' % merge[0]) if __name__ == '__main__': try: diff --git a/grafts b/merges similarity index 100% rename from grafts rename to merges -- 1.7.9.5