[Pkg-kde-commits] rev 1090 - scripts

[Adeodato Simó]

Author: dato-guest
Date: 2005-05-22 15:00:55 +0000 (Sun, 22 May 2005)
New Revision: 1090

Modified:
   scripts/pull-kde-branch
Log:
Run filterdiff to remove property diffs, as per MadCoder's suggestion.
Add a #DPATCHLEVEL=0 header to the generated diff.


Modified: scripts/pull-kde-branch
===================================================================
--- scripts/pull-kde-branch	2005-05-22 14:43:20 UTC (rev 1089)
+++ scripts/pull-kde-branch	2005-05-22 15:00:55 UTC (rev 1090)
@@ -9,14 +9,6 @@
 # TODO
 # <MadCoder> 1/ it does not work for arts
 # <MadCoder>   (since it thinks kde is kde 1.4.0 instead of 3.4.0 ...)
-#
-# <MadCoder> and (3) the diff is bloated with every svn property changes
-# <MadCoder> and I'm not sure we want that
-# <MadCoder> take kdeaccessibility branch pull e.g.
-# <MadCoder> 2/3 of the file are mime types changes
-#
-# <dato> so (3) needs investigating, and (1) needs fixing
-#
 
 set -e
 
@@ -62,7 +54,8 @@
 trap "rm -f $TMP_PATCH" EXIT
 
 echo "Getting diff file from server..."
-svn diff "$ARG1" "$ARG2" | filterdiff -x 'debian/*' >${TMP_PATCH}
+echo "#DPATCHLEVEL=0" >${TMP_PATCH}
+svn diff "$ARG1" "$ARG2" | filterdiff -x 'debian/*' | filterdiff >>${TMP_PATCH}
 
 # Find out the revision of this new pull, unless empty
 # Gross hack coming...
@@ -70,7 +63,7 @@
     echo "Diff file was empty, no patch created."
     exit
 else
-    NEW_REVISION=$(sed -rne '4s/.*revision ([0-9]+).*/\1/p' ${TMP_PATCH})
+    NEW_REVISION=$(sed -rne '2s/.*revision ([0-9]+).*/\1/p' ${TMP_PATCH})
 fi
 
 # Move patch to its final destination