/[pkg-kde]/scripts/pull-kde-branch
ViewVC logotype

Diff of /scripts/pull-kde-branch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1089 by dato-guest, Sun May 22 14:43:20 2005 UTC revision 1090 by dato-guest, Sun May 22 15:00:55 2005 UTC
# Line 9  Line 9 
9  # TODO  # TODO
10  # <MadCoder> 1/ it does not work for arts  # <MadCoder> 1/ it does not work for arts
11  # <MadCoder>   (since it thinks kde is kde 1.4.0 instead of 3.4.0 ...)  # <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  
 #  
12    
13  set -e  set -e
14    
# Line 62  TMP_PATCH=$(mktemp debian/patches/branch Line 54  TMP_PATCH=$(mktemp debian/patches/branch
54  trap "rm -f $TMP_PATCH" EXIT  trap "rm -f $TMP_PATCH" EXIT
55    
56  echo "Getting diff file from server..."  echo "Getting diff file from server..."
57  svn diff "$ARG1" "$ARG2" | filterdiff -x 'debian/*' >${TMP_PATCH}  echo "#DPATCHLEVEL=0" >${TMP_PATCH}
58    svn diff "$ARG1" "$ARG2" | filterdiff -x 'debian/*' | filterdiff >>${TMP_PATCH}
59    
60  # Find out the revision of this new pull, unless empty  # Find out the revision of this new pull, unless empty
61  # Gross hack coming...  # Gross hack coming...
# Line 70  if [ ! -s ${TMP_PATCH} ]; then Line 63  if [ ! -s ${TMP_PATCH} ]; then
63      echo "Diff file was empty, no patch created."      echo "Diff file was empty, no patch created."
64      exit      exit
65  else  else
66      NEW_REVISION=$(sed -rne '4s/.*revision ([0-9]+).*/\1/p' ${TMP_PATCH})      NEW_REVISION=$(sed -rne '2s/.*revision ([0-9]+).*/\1/p' ${TMP_PATCH})
67  fi  fi
68    
69  # Move patch to its final destination  # Move patch to its final destination
Legend:
Removed from v.1089  
changed lines
  Added in v.1090
  ViewVC Help
Powered by ViewVC 1.1.5