blob: 40c077a3e59fa1c80f0f1947e2a1fc502057f2e3 (
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
#!/bin/bash
here=`pwd`
here=`basename $here`
if [ "x$here" != "xsources" ]
then
echo Must be in 'sources' directory.
exit 1
fi
if false
then
ser > /dev/null 2>&1
echo "Updating SVN trunk"
cd gcc-fsf-svn/trunk
svn up
echo "Updating SVN linaro-4.8"
cd ../linaro-gcc-4_8-branch
svn up
echo "Updating BZR linaro-4.8"
cd ../../gcc-linaro-4.8/4.8
bzr pull
cd ../..
fi
revs_file=/tmp/backport-revs.$$
trap "cat $revs_file ; rm $revs_file" EXIT ERR
rm -f $revs_file
# save arguments before overwriting $1, $2....
while [ $# -gt 0 ]
do
echo $1 >> $revs_file
shift
done
cat $revs_file | while read revs
do
shift
echo Merging $revs....
set $revs
revs_name=""
revs_args=""
revs_log=""
while [ $# -gt 0 ]
do
revs_name="$revs_name-$1"
revs_args="$revs_args -c $1"
revs_log="$revs_log,$1"
shift
done
# Replace leading "," with "r"
revs_log=`echo $revs_log | sed 's/,/r/'`
cd gcc-fsf-svn
echo "Creating SVN merge$revs_name"
cp -a linaro-gcc-4_8-branch merge$revs_name
cd merge$revs_name
echo "svn merge $revs_args ../trunk"
# Handle conflicts + ChangeLog interactively
xterm -e "svn merge $revs_args ../trunk"
cd ../../gcc-linaro-4.8
echo "Creating BZR merge$revs_name"
bzr branch 4.8 merge$revs_name
cd ..
echo "Computing diffs"
diff -ruNp -x '*.svn' -x '*~' -x '*.bzr' -x '*.rej' -x '*.orig' -x '*.edited' gcc-linaro-4.8/merge$revs_name gcc-fsf-svn/merge$revs_name > merge$revs_name.txt
# Warn if binary files need manual merge
grep "Binary files" merge$revs_name.txt && xmessage "Binary files in $revs_name" && xterm
cd gcc-linaro-4.8/merge$revs_name
bzr patch -p2 ../../merge$revs_name.txt
# Manually add new files if any
bzr st | grep unknown: && xmessage "New files to add in $revs_name" && xterm
bzr commit -m "Backport from trunk $revs_log"
# Push new branch
xterm -e "bzr push lp:~christophe-lyon/gcc-linaro/4.8-merge$revs_name"
# Open branch page, to submit merge request
bzr lp-open
cd ../..
done
|
