diff options
Diffstat (limited to 'svnmerge.py')
| -rw-r--r-- | svnmerge.py | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/svnmerge.py b/svnmerge.py new file mode 100644 index 0000000..7b90652 --- /dev/null +++ b/svnmerge.py @@ -0,0 +1,47 @@ +import os, os.path + +svnbase = "/home/jim/PyKDE/" +newbase = "/home/jim/PyKDE352/" + +newfiles = os.listdir (os.path.join (newbase, "sip")) + +for file in newfiles: + newpath = os.path.join (newbase, "sip", file) + if os.path.isdir (newpath): + svnpath = os.path.join (svnbase, "sip", file) + if os.path.exists (svnpath): + newsip = os.listdir (newpath) + svnsip = os.listdir (svnpath) + for sip in newsip: + os.system ("cp %s %s" % (os.path.join (newpath, sip), svnpath)) + if sip not in svnsip: + os.system ("svn add %s" % (os.path.join (svnpath, sip))) + print "added %s" % sip + else: + os.system ("cp -R %s %s" % (newpath, svnpath)) + os.system ("svn add %s" % svnpath) + print "added %s" % svnpath + +newfiles = os.listdir (os.path.join (newbase, "extra")) + +for file in newfiles: + newpath = os.path.join (newbase, "extra", file) + if os.path.isdir (newpath): + svnpath = os.path.join (svnbase, "extra", file) + if os.path.exists (svnpath): + newextra = os.listdir (newpath) + svnextra = os.listdir (svnpath) + for extra in newextra: + os.system ("cp %s %s" % (os.path.join (newpath, extra), svnpath)) + if extra not in svnextra: + os.system ("svn add %s" % (os.path.join (svnpath, extra))) + print "added %s" % extra + else: + os.system ("cp -R %s %s" % (newpath, svnpath)) + os.system ("svn add %s" % svnpath) + print "added %s" % svnpath + +files = ["configure.py", "*.prj", "svnm*"] + +for file in files: + os.system ("cp %s %s" % (os.path.join (newbase, file), os.path.join (svnbase, file)))
\ No newline at end of file |