# merge kde4@DEVEL with kde4@HEAD - actually it replaces HEAD with DEVEL
# so the actual merge must be done earlier manually.
#
-# Author: Bartosz Swiatek (shadzik@pld-linux.org)
+# Author: Bartosz Świątek (shadzik@pld-linux.org)
+#
+# TODO:
+# - find a way to automatically detect whether to merge _all_ patches, or which to merge and which don't
usage() {
echo "Usage: $0 [-b] [-d] [-h] kde4-kdemodule[.spec]"
echo ""
- echo "-b => merge also the branchdiff"
+ echo "-b => move also the branchdiff"
echo "-d => debug mode \(set +e\)"
echo "-h => show this help"
echo ""
echo "Changing to stable"
sed -i -e 's/unstable/stable/g' packages/$PKG/$kde4spec
echo "Done, seding"
-cvs ci -m "- merged from DEVEL" packages/$PKG/$kde4spec
+cvs ci -m "- moved from DEVEL" packages/$PKG/$kde4spec
echo "Deleting DEVEL branch from spec"
cvs tag -B -d DEVEL packages/$PKG/$kde4spec
mv packages/$PKG/$PKG-branch.diff /tmp/$PKG-branch.diff-dev
cvs get packages/$PKG/$PKG-branch.diff
mv /tmp/$PKG-branch.diff-dev packages/$PKG/$PKG-branch.diff
- cvs ci -m "- merged from DEVEL" packages/$PKG/$PKG-branch.diff
+ cvs ci -m "- moved from DEVEL" packages/$PKG/$PKG-branch.diff
echo "Deleting DEVEL branch from branchdiff"
cvs tag -B -d DEVEL packages/$PKG/$PKG-branch.diff
fi