3 LOG_FILE="../merge.log"
6 build_dir="/scratch/sfr/next"
7 build_cmd="bin/build_next"
8 [ "$NEXT_BUILD_HOST" ] && build_host="$NEXT_BUILD_HOST"
9 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
21 [ -z "$start_from" ] && {
22 echo "-s requires a start tree" 1>&2
36 export NEXT_BUILD_HOST="$build_host"
37 export NEXT_BUILD_DIR="$build_dir"
41 echo "$@" | tee -a $LOG_FILE
47 $@ 2>&1 | tee -a $LOG_FILE
48 return ${PIPESTATUS[0]}
56 rbid=$(git rev-parse $2/$rbase)
57 rtid=$(git rev-parse $2/$rtop)
58 [ "$rbid" = "$rtid" ] && {
62 [ "$(git rev-list HEAD..$2/$rtop)" ] || {
66 execute git clone -s -l -n -q . ../rebase-tmp || {
67 echo Clone failed 1>&2
70 log '$' cd ../rebase-tmp
72 execute git fetch --no-tags ../next refs/remotes/$2/$rtop:$2/$rtop || {
73 echo Fetch of top failed 1>&2
76 execute git fetch --no-tags ../next refs/remotes/$2/$rbase:$2/$rbase || {
77 echo Fetch of base failed 1>&2
80 execute git checkout $2/$rtop || {
81 echo Checkout of top failed 1>&2
84 execute git rebase --onto master $2/$rbase || {
85 echo Rebase failed 1>&2
90 execute git pull -f ../rebase-tmp $2/$rtop || {
92 echo $h >>../merge.debug
93 git diff >>../merge.debug 2>&1
94 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
98 execute rm -rf ../rebase-tmp
101 [ -n "$start_from" ] || {
102 cp /dev/null $LOG_FILE
104 execute git checkout master
105 execute git reset --hard stable
106 printf 'Name\t\tSHA1\n----\t\t----\n' > $SHA1_FILE
110 heads=$(grep -v '^#' ../etc/control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
117 [ -n "$start_from" ] && {
118 if [ "$tree" = "$start_from" ]; then
125 hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
126 log Merging $h "($hlog)"
127 old_head=$(git rev-parse HEAD)
128 [ -x "../pre-merge/$tree" ] && {
129 "../pre-merge/$tree" || bash -i || exit
136 execute git merge $h || {
137 echo Merge failed 1>&2
138 echo $h >>../merge.debug
139 git diff >>../merge.debug 2>&1
140 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
143 GIT_EDITOR=: execute git commit -v -a
144 execute git diff -M --stat --summary 'HEAD^..'
148 [ -f "../merge-fixes/$tree" ] && {
149 for p in $(cat "../merge-fixes/$tree"); do
150 $(dirname $0)/merge_fix -n "$p" || {
156 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
157 printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
158 [ -x "../pre-build/$tree" ] && {
159 "../pre-build/$tree" || bash -i || exit
161 $no_build && continue
163 # See if we need to build after merging this tree
164 new_head=$(git rev-parse HEAD)
165 [ "$old_head" = "$new_head" ] ||
166 [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] ||
171 do_build=$(grep -v '^#' ../etc/control | awk -F ' ' '$3=="'$tree'" { print $6; }')
172 [ "$do_build" = "yes" ] ||
174 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
175 echo git push failed 1>&2
178 ssh "$build_host" "$build_cmd" || {
179 echo Build failed 1>&2