OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 22-Dec-2006 20:48:41
Branch: HEAD Handle: 2006122219484000
Modified files:
openpkg-tools/cmd dev.sh
Log:
add support for tracking merge point (MP) when committing on branches
Summary:
Revision Changes Path
1.95 +27 -3 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.94 -r1.95 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:36:06 -0000 1.94
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 19:48:40 -0000 1.95
@@ -1890,7 +1890,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -F
"${msg}" $files )
+ ( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit -F "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+ )
else
echo cvs commit -F "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1899,7 +1905,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit
$files )
+ ( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+ )
else
echo cvs commit $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1908,7 +1920,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
- ( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -m
"${msg}" $files )
+ ( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit -m "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+ )
else
echo cvs commit -m "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1956,6 +1974,12 @@
fi
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_SAVE}/${upload}/
eval "builtin cd ${OPENPKG_WORK}/$S && command cvs commit
${bundle_msg} ${bundle_files}"
+ ( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $bundle_files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+ )
else
echo chmod 664 ${bundle_srpms}
if [ ".${bundle_wipes}" != . ]; then
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
