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:36:07
Branch: HEAD Handle: 2006122219360600
Modified files:
openpkg-tools/cmd dev.sh
Log:
add support for merging all changes from a merge point (MP)
Summary:
Revision Changes Path
1.94 +9 -2 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.93 -r1.94 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:34:41 -0000 1.93
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 19:36:06 -0000 1.94
@@ -935,7 +935,8 @@
(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
else
echo "++ joining package ${name} with HEAD"
- (builtin cd ${OPENPKG_WORK}/$S/${name} || exit 1
+ (cd ${OPENPKG_WORK}/$S/${name} || exit 1
+ anchestor=""; cvs log ${name}.spec | sed -n -e '/^symbolic
names:/,/^[^ \t]/p' | sed -e '1d' -e 's/^[ \t]*//' -e '$d' | ${EGREP}
"^${B}_MP: " >/dev/null && anchestor="${B}_MP"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
haverelease=`${EGREP} <${name}.spec '^Release:'`
havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
@@ -951,7 +952,13 @@
-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinbprereq\2;" \
-e "s;^\(PreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinrprereq\2;" \
&& mv ${name}.spec.n ${name}.spec
- cvs update -j1
+ if [ ".$anchestor" = . ]; then
+ echo "++ merging all changes from branchpoint"
+ cvs update -j1
+ else
+ echo "++ merging all changes from $anchestor"
+ cvs update -j$anchestor -j1
+ fi
sed <${name}.spec >${name}.spec.n \
-e "s;^Release: .*;$haverelease;" \
-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$havebprereq\2;" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
