| 38ea2ddc |
1 | #!/bin/bash |
| 2 | # merge kde4@DEVEL with kde4@HEAD - actually it replaces HEAD with DEVEL |
| 3 | # so the actual merge must be done earlier manually. |
| 4 | # |
| 5 | # Author: Bartosz Swiatek (shadzik@pld-linux.org) |
| 6 | |
| 7 | usage() { |
| 8 | echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]" |
| 9 | echo "" |
| 10 | echo "-b => merge also the branchdiff" |
| 11 | echo "-d => debug mode \(set +e\)" |
| 12 | echo "-h => show this help" |
| 13 | echo "" |
| 14 | exit 1 |
| 15 | } |
| 16 | |
| 17 | BRANCHDIFF=no |
| 18 | MODULE=$2 |
| 19 | |
| 20 | while [ $# -gt 0 ]; do |
| 21 | case "$1" in |
| 22 | -b ) |
| 23 | BRANCHDIFF=yes |
| 24 | ;; |
| 25 | -d ) |
| 26 | set +e |
| 27 | ;; |
| 28 | -h ) |
| 29 | usage |
| 30 | ;; |
| 31 | -* ) |
| 32 | die "Unknown option: $1" |
| 33 | ;; |
| 34 | * ) # no option, just module |
| 35 | MODULE=$1 |
| 36 | ;; |
| 37 | esac |
| 38 | shift |
| 39 | done |
| 40 | |
| 41 | if [ "$MODULE" == "" ]; then |
| 42 | usage |
| 43 | fi |
| 44 | |
| 45 | kde4spec=`case "$MODULE" in |
| 46 | *.spec ) |
| 47 | echo $MODULE |
| 48 | ;; |
| 49 | * ) |
| 50 | echo $MODULE.spec |
| 51 | ;; |
| 52 | esac` |
| 53 | PKG=$(echo $kde4spec |sed -e 's/.spec//g') |
| 54 | |
| 55 | # start |
| 56 | |
| 57 | cvs get -r DEVEL packages/$PKG/$kde4spec |
| 58 | mv packages/$PKG/$kde4spec /tmp/$kde4spec-dev |
| 59 | cvs get packages/$PKG/$kde4spec |
| 60 | mv /tmp/$kde4spec-dev packages/$PKG/$kde4spec |
| 61 | echo "Changing to stable" |
| 62 | sed -i -e 's/unstable/stable/g' packages/$PKG/$kde4spec |
| 63 | echo "Done, seding" |
| 64 | cvs ci -m "- merged from DEVEL" packages/$PKG/$kde4spec |
| 65 | echo "Deleting DEVEL branch from spec" |
| 66 | cvs tag -B -d DEVEL packages/$PKG/$kde4spec |
| 67 | |
| 68 | if [ "x$BRANCHDIFF" == "xyes" ]; then |
| 69 | cvs get -r DEVEL packages/$PKG/$PKG-branch.diff |
| 70 | mv packages/$PKG/$PKG-branch.diff /tmp/$PKG-branch.diff-dev |
| 71 | cvs get packages/$PKG/$PKG-branch.diff |
| 72 | mv /tmp/$PKG-branch.diff-dev packages/$PKG/$PKG-branch.diff |
| 73 | cvs ci -m "- merged from DEVEL" packages/$PKG/$PKG-branch.diff |
| 74 | echo "Deleting DEVEL branch from branchdiff" |
| 75 | cvs tag -B -d DEVEL packages/$PKG/$PKG-branch.diff |
| 76 | fi |
projects / packages / rpm-build-tools.git / blame