Index: bin/svn-migration.py
===================================================================
RCS file: /cvs/gnome/svn-migration/bin/svn-migration.py,v
retrieving revision 1.15
diff -u -p -r1.15 svn-migration.py
--- bin/svn-migration.py 24 Oct 2006 13:58:28 -0000 1.15
+++ bin/svn-migration.py 1 Nov 2006 23:39:47 -0000
@@ -210,7 +210,13 @@ $REV="$2"
raise Exception("Could not check out CVS module for comparison")
# Remove 'macros' subdir (spoils the diffs)
- os.system("rm -rf %s/macros" % module)
+ # but do this only if it is the magic one from gnome-common
+ # (and the module is NOT gnome-common)
+
+ if(module != "gnome-common" && os.path.isfile("%s/macros/CVS/Repository" % module))
+ file = open("%s/macros/CVS/Repository" % module)
+ if(file.readline() ~ /gnome-common\/macros/) # this is perl syntax, convert this to python
+ os.system("rm -rf %s/macros" % module)
# Rename it to '-HEAD'
os.system("mv %s %s" % (module, moduletestdir))