4 # Contact: LeWiemann@gmail.com
7 # Copyright: This script has been placed in the public domain.
11 if test -z "$1" -o "$1" == "-h" -o "$1" == "--help"; then
12 echo Usage
: "`basename "$0"` [-c] <revision> [[-c] <revision> ...]"
14 echo 'Any revision number that is prepended with "-c" is only checked in;'
15 echo 'no actual merging is done. (Useful for resuming aborted backports,'
16 echo 'for example after manually resolving conflicts.)'
20 while test -n "$1"; do
22 if test "$1" == "-c"; then
25 echo 'Error: Expected revision number after "-c".'
31 if test ! "$DOCUTILS_MAINT_BRANCH"; then
32 echo '$DOCUTILS_MAINT_BRANCH must point to the directory of the'
33 echo 'maintenance branch.'
37 cd "$DOCUTILS_MAINT_BRANCH"
38 if test -z "$commit_only"; then
41 svn merge
-r"$[$r-1]:$r" ..
/..
/trunk
/docutils .
44 if test "`svn st docutils test *.py -q`"; then
45 # Some code has changed.
46 # Python 2.5 is faster and outputs unified diffs for the functional
47 # tests, so it comes first.
48 nice python2.5
-u test
/alltests.py
49 nice python2.1
-u test
/alltests.py
50 nice python2.2
-u test
/alltests.py
51 nice python2.3
-u test
/alltests.py
52 nice python2.4
-u test
/alltests.py
55 echo Press enter to commit or Ctrl
+C to abort.
57 svn ci
-m "--- MERGE: merged r$r to maintenance branch; original log message:
58 `svn pg svn:log --revprop -r "$r"`"