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 Świątek (shadzik@pld-linux.org)
8 # - find a way to automatically detect whether to merge _all_ patches, or which to merge and which don't
11 echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]"
13 echo "-b => move also the branchdiff"
14 echo "-d => debug mode \(set +e\)"
15 echo "-h => show this help"
23 while [ $# -gt 0 ]; do
35 die "Unknown option: $1"
37 * ) # no option, just module
44 if [ "$MODULE" == "" ]; then
48 kde4spec=`case "$MODULE" in
56 PKG=$(echo $kde4spec |sed -e 's/.spec//g')
60 cvs get -r DEVEL packages/$PKG/$kde4spec
61 mv packages/$PKG/$kde4spec /tmp/$kde4spec-dev
62 cvs get packages/$PKG/$kde4spec
63 mv /tmp/$kde4spec-dev packages/$PKG/$kde4spec
64 echo "Changing to stable"
65 sed -i -e 's/unstable/stable/g' packages/$PKG/$kde4spec
67 cvs ci -m "- moved from DEVEL" packages/$PKG/$kde4spec
68 echo "Deleting DEVEL branch from spec"
69 cvs tag -B -d DEVEL packages/$PKG/$kde4spec
71 if [ "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
76 cvs ci -m "- moved from DEVEL" packages/$PKG/$PKG-branch.diff
77 echo "Deleting DEVEL branch from branchdiff"
78 cvs tag -B -d DEVEL packages/$PKG/$PKG-branch.diff