blob: 10397845687af5c69eddabd85a66f5eac3b2e2c8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
#!/bin/sh
# Forwardport the last change in a branch to HEAD
# Usage: cvsforwardport <files>
# WARNING: the branch tag is hardcoded into the script, make sure to check it!
#
# Initial author: Dirk Mueller
# Support for multiple command-line arguments: David Faure
BRANCH=KDE_3_4_BRANCH
echo "Forwardporting to HEAD"
TMPFILE=`mktemp cvsforwardport.XXXXXX` || exit 1
files=$*
until test $# -eq 0; do
echo "looking for last change to $1..."
CVSLASTCHANGE_KEEP_WHITESPACE=1 cvslastchange $1 > $TMPFILE
echo "browsing last change to $1..."
less $TMPFILE
cvs up -A $1
patch < $TMPFILE
rm -f $TMPFILE
echo "showing diff for $1..."
cvs diff $1 | less
shift
done
echo "Press ENTER now to commit ($files) or Ctrl+C to abort"
read confirm
cvs commit $files
cvs up -r $BRANCH $files
|
