]> git.pld-linux.org Git - packages/rpm-build-tools.git/blame - kde4devel2head.sh
When tripping over a GIT_ var, give a useful error
[packages/rpm-build-tools.git] / kde4devel2head.sh
CommitLineData
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#
afa24241 5# Author: Bartosz Świątek (shadzik@pld-linux.org)
b1f4cc56 6#
7# TODO:
8# - find a way to automatically detect whether to merge _all_ patches, or which to merge and which don't
38ea2ddc 9
10usage() {
11 echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]"
12 echo ""
468e70fd 13 echo "-b => move also the branchdiff"
38ea2ddc 14 echo "-d => debug mode \(set +e\)"
15 echo "-h => show this help"
16 echo ""
17 exit 1
18}
19
20BRANCHDIFF=no
21MODULE=$2
22
23while [ $# -gt 0 ]; do
24 case "$1" in
25 -b )
26 BRANCHDIFF=yes
27 ;;
28 -d )
29 set +e
30 ;;
31 -h )
32 usage
33 ;;
34 -* )
35 die "Unknown option: $1"
36 ;;
37 * ) # no option, just module
38 MODULE=$1
39 ;;
40 esac
41 shift
42done
43
44if [ "$MODULE" == "" ]; then
45 usage
46fi
47
48kde4spec=`case "$MODULE" in
49 *.spec )
50 echo $MODULE
51 ;;
52 * )
53 echo $MODULE.spec
54 ;;
55esac`
56PKG=$(echo $kde4spec |sed -e 's/.spec//g')
57
58# start
59
60cvs get -r DEVEL packages/$PKG/$kde4spec
61mv packages/$PKG/$kde4spec /tmp/$kde4spec-dev
62cvs get packages/$PKG/$kde4spec
63mv /tmp/$kde4spec-dev packages/$PKG/$kde4spec
64echo "Changing to stable"
65sed -i -e 's/unstable/stable/g' packages/$PKG/$kde4spec
66echo "Done, seding"
468e70fd 67cvs ci -m "- moved from DEVEL" packages/$PKG/$kde4spec
38ea2ddc 68echo "Deleting DEVEL branch from spec"
69cvs tag -B -d DEVEL packages/$PKG/$kde4spec
70
71if [ "x$BRANCHDIFF" == "xyes" ]; then
72 cvs get -r DEVEL packages/$PKG/$PKG-branch.diff
73 mv packages/$PKG/$PKG-branch.diff /tmp/$PKG-branch.diff-dev
74 cvs get packages/$PKG/$PKG-branch.diff
75 mv /tmp/$PKG-branch.diff-dev packages/$PKG/$PKG-branch.diff
468e70fd 76 cvs ci -m "- moved from DEVEL" packages/$PKG/$PKG-branch.diff
38ea2ddc 77 echo "Deleting DEVEL branch from branchdiff"
78 cvs tag -B -d DEVEL packages/$PKG/$PKG-branch.diff
79fi
This page took 0.071613 seconds and 4 git commands to generate.