Author: duncan
Date: Sun Mar 11 18:09:24 2007
New Revision: 9325
Added:
branches/rel-1/freevo/cl2wiki (contents, props changed)
branches/rel-1/freevo/howtomerge (contents, props changed)
Log:
Added two scripts that are often used
howtomerge, merges from rel-1-6 to rel-1 branch
cl2wiki, generates the wiki page from the ChangeLog
Added: branches/rel-1/freevo/cl2wiki
==============================================================================
--- (empty file)
+++ branches/rel-1/freevo/cl2wiki Sun Mar 11 18:09:24 2007
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+file=${1:?No file specified}
+
+sed -e
's/B#\([0-9][0-9]*\)/[http:\/\/sourceforge.net\/tracker\/index.php?func=detail\&group_id=46652\&atid=446895\&aid=\1
&]/g' -e
's/F#\([0-9][0-9]*\)/[http:\/\/sourceforge.net\/tracker\/index.php?func=detail\&group_id=46652\&atid=446898\&aid=\1
&]/g' $file
Added: branches/rel-1/freevo/howtomerge
==============================================================================
--- (empty file)
+++ branches/rel-1/freevo/howtomerge Sun Mar 11 18:09:24 2007
@@ -0,0 +1,16 @@
+#!/bin/bash
+last=9238
+
+LAST=${1:-${last}}
+cd /sources/svn/freevo-1.x/freevo
+echo "last change is: ${LAST}"
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ . --dry-run
+echo "press enter to do it"
+read ENTER
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ .
+
+#svn export -r8215
svn://svn.freevo.org/freevo/branches/rel-1/freevo/src/video/plugins/xine.py x.py
+#svn log --verbose --stop-on-copy
/sources/svn/freevo-1.6/src/www/htdocs/library.rpy
+#svn merge -r8389:HEAD /sources/svn/freevo-1.6/src/www/htdocs/library.rpy
src/www/htdocs/library.rpy
+#svn merge -r8389:8390
svn://svn.freevo.org/freevo/branches/rel-1-6/freevo/src/www/htdocs/library.rpy
src/www/htdocs/library.rpy
+#svn propedit --revprop -r 9323 svn:log src/audio/audioitem.py
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
