X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fmkpatch;h=c8df21c9ec9fb517c413f6ca4fa0e696c9304372;hb=51cd9d6e073932fcb37f1857c66249d6c7d368ee;hp=3daa604db3be6155c3eecb763ded9cd751106eb1;hpb=35d958cf769ba0efad9f7eeb43a54dc6d3c95556;p=oota-llvm.git

diff --git a/utils/mkpatch b/utils/mkpatch
index 3daa604db3b..c8df21c9ec9 100755
--- a/utils/mkpatch
+++ b/utils/mkpatch
@@ -18,19 +18,20 @@ if [ "$#" -ne 1 ] ; then
 fi
 NAME="$1"
 echo "mkpatch: Generating differences on top level files"
-cvs diff -l -Ntdup -5 . > "$NAME".patch.raw 2>&1
+svn diff -N -x -u > "$NAME".patch.raw 2>&1
 echo "mkpatch: Generating differences on all directories"
-cvs diff -Ntdup -5 >> "$NAME".patch.raw 2>&1 \
+svn diff -x -u  >> "$NAME".patch.raw 2>&1 \
   autoconf docs utils include lib/System lib/Support lib/VMCore lib/AsmParser \
-  lib/Bytecode lib/Analysis lib/Transforms lib/CodeGen lib/Target \
+  lib/Bitcode lib/Analysis lib/Transforms lib/CodeGen lib/Target \
   lib/ExecutionEngine lib/Debugger lib/Linker \
   tools test runtime projects examples win32 Xcode
 
 echo "mkpatch: Removing cruft from the patch file"
-sed "$NAME".patch.raw -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' | awk '\
+sed -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' "$NAME".patch.raw | awk '\
 BEGIN { deleting = 0; } \
-/^Index: .*[.]cvs$/ { deleting = 1; } \
+/^Index: .*[.]cvs$/ { deleting = 1; fname=substr($0,7); \
+  print "Skipping: ", fname > "/dev/stderr"; } \
 /^Index:.*/ && !/^Index: .*[.]cvs$/ { deleting = 0; } \
-{ if (! deleting) { print; } } \
-'  > "$NAME".patch  || error "sed/awk cleanup failed"
+{ if (! deleting) { print; } } '  > "$NAME".patch  || \
+  error "sed/awk cleanup failed"