|
Revision 1079, 0.7 kB
(checked in by duncan, 15 months ago)
|
|
Merged changes from rel-1
Updated the "merge to rel 1[7]" scripts
|
-
Property svn:eol-style set to
native
-
Property svn:executable set to
*
-
Property svn:keywords set to
Author Date Id Revision
|
| Line | |
|---|
| 1 | #!/bin/bash |
|---|
| 2 | last=10029 |
|---|
| 3 | |
|---|
| 4 | LAST=${1:-${last}} |
|---|
| 5 | cd /sources/svn/freevo-1/rel-1 |
|---|
| 6 | echo "last change is: ${LAST}" |
|---|
| 7 | svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1-7 . --dry-run |
|---|
| 8 | echo "press enter to do it" |
|---|
| 9 | read ENTER |
|---|
| 10 | svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1-7 . |
|---|
| 11 | |
|---|
| 12 | #svn export -r8215 svn://svn.freevo.org/freevo/branches/rel-1/freevo/src/video/plugins/xine.py x.py |
|---|
| 13 | #svn log --verbose --stop-on-copy /sources/svn/freevo-1.6/src/www/htdocs/library.rpy |
|---|
| 14 | #svn merge -r8389:HEAD /sources/svn/freevo-1.6/src/www/htdocs/library.rpy src/www/htdocs/library.rpy |
|---|
| 15 | #svn merge -r8389:8390 svn://svn.freevo.org/freevo/branches/rel-1-6/freevo/src/www/htdocs/library.rpy src/www/htdocs/library.rpy |
|---|
| 16 | #svn propedit --revprop -r 9323 svn:log src/audio/audioitem.py |
|---|
