|
Revision 1079, 266 bytes
(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-7 |
|---|
| 6 | echo "last change is: ${LAST}" |
|---|
| 7 | svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1 . --dry-run |
|---|
| 8 | echo "press enter to do it" |
|---|
| 9 | read ENTER |
|---|
| 10 | svn merge -r${LAST}:HEAD /sources/svn/freevo-1/rel-1 . |
|---|
