Parent Directory | Revision Log | Patch
revision 319 by dpavlin, Sun Apr 18 00:51:41 2004 UTC | revision 668 by dpavlin, Wed Feb 16 00:04:13 2005 UTC | |
---|---|---|
# | Line 1 | Line 1 |
1 | #!/bin/sh | #!/bin/sh |
2 | ||
3 | if [ -z "$1" ] ; then | if [ -z "$1" ] ; then |
4 | echo "Usage: $0 [revision]" | echo "Usage: $0 [from revision] [to revision|HEAD]" |
5 | exit 1 | exit 1 |
6 | fi | fi |
7 | ||
8 | rev=$1 | rev=$1 |
9 | to=HEAD | |
10 | if [ ! -z "$2" ] ; then | |
11 | to=$2 | |
12 | fi | |
13 | ||
14 | find branches/ -type d -maxdepth 1 -mindepth 1 | grep -v \.svn | xargs -i svn merge -r$rev:HEAD trunk/ {} | find branches/ -type d -maxdepth 1 -mindepth 1 | grep -v \.svn | xargs -i svn merge -r$rev:$to trunk/ {} |
|
ViewVC Help | |
Powered by ViewVC 1.1.26 |