packages: kde4devel2head.sh - 21:39 < arekm> anyway pisz moved, a nie merged

[shadzik]

Author: shadzik                      Date: Sun Feb 21 20:41:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 21:39 < arekm> anyway pisz moved, a nie merged

---- Files affected:
packages:
   kde4devel2head.sh (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kde4devel2head.sh
diff -u packages/kde4devel2head.sh:1.3 packages/kde4devel2head.sh:1.4
--- packages/kde4devel2head.sh:1.3	Thu Feb 18 17:01:15 2010
+++ packages/kde4devel2head.sh	Sun Feb 21 21:41:22 2010
@@ -10,7 +10,7 @@
 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 ""
@@ -64,7 +64,7 @@
 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
 
@@ -73,7 +73,7 @@
 	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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4devel2head.sh?r1=1.3&r2=1.4&f=u