2 # merge kde4@DEVEL with kde4@HEAD - actually it replaces HEAD with DEVEL
3 # so the actual merge must be done earlier manually.
5 # Author: Bartosz Swiatek (shadzik@pld-linux.org)
8 echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]"
10 echo "-b => merge also the branchdiff"
11 echo "-d => debug mode \(set +e\)"
12 echo "-h => show this help"
20 while [ $# -gt 0 ]; do
32 die "Unknown option: $1"
34 * ) # no option, just module
41 if [ "$MODULE" == "" ]; then
45 kde4spec=`case "$MODULE" in
53 PKG=$(echo $kde4spec |sed -e 's/.spec//g')
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
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
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