Author: duncan
Date: Mon Oct 22 10:48:19 2007
New Revision: 10025
Log:
Updated svn merge helper script to allows merges to or from rel-1-7
Added:
branches/rel-1/freevo/mergetorel1 (contents, props changed)
branches/rel-1/freevo/mergetorel17
- copied, changed from r10012, /branches/rel-1/freevo/howtomerge
Removed:
branches/rel-1/freevo/howtomerge
Added: branches/rel-1/freevo/mergetorel1
==============================================================================
--- (empty file)
+++ branches/rel-1/freevo/mergetorel1 Mon Oct 22 10:48:19 2007
@@ -0,0 +1,16 @@
+#!/bin/bash
+last=10020
+
+LAST=${1:-${last}}
+cd /sources/svn/freevo-1/rel-1
+echo "last change is: ${LAST}"
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1-7 . --dry-run
+echo "press enter to do it"
+read ENTER
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1-7 .
+
+#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
Copied: branches/rel-1/freevo/mergetorel17 (from r10012,
/branches/rel-1/freevo/howtomerge)
==============================================================================
--- /branches/rel-1/freevo/howtomerge (original)
+++ branches/rel-1/freevo/mergetorel17 Mon Oct 22 10:48:19 2007
@@ -1,17 +1,10 @@
#!/bin/bash
-last=9976
+last=10020
LAST=${1:-${last}}
-cd /sources/svn/freevo-1.x/freevo
+cd /sources/svn/freevo-1/rel-1-7
echo "last change is: ${LAST}"
-svn merge -r${LAST}:HEAD /home/duncan/rel-1.7.3/ . --dry-run
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1 . --dry-run
echo "press enter to do it"
read ENTER
-#svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ .
-svn merge -r${LAST}:HEAD /home/duncan/rel-1.7.3/ .
-
-#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
+svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1 .
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
