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"
20 rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
22 echo "No such tree/date" 1>&2
35 export NEXT_BUILD_HOST="$build_host"
36 export NEXT_BUILD_DIR="$build_dir"
40 echo "$@" | tee -a $LOG_FILE
46 $@ 2>&1 | tee -a $LOG_FILE
47 return ${PIPESTATUS[0]}
50 bad_rev=$(git rev-parse --verify 'HEAD^2')
52 line="$(tail -n 1 $SHA1_FILE)"
54 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
55 expected=$(printf "%s$tab%s" $tree $bad_rev)
56 [ "$line" = "$expected" ] || {
57 echo "bad last line in $SHA1_FILE" 1>&2
61 GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
62 echo "git reset failed" 1>&2
66 log Merging "$ver version of $tree"
67 execute git merge -m "$ver/$tree" "$rev" || {
68 echo Merge failed 1>&2
69 echo "$ver version of $tree" >>../merge.debug
70 git diff >>../merge.debug 2>&1
71 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
74 GIT_EDITOR=: execute git commit -v -a
75 execute git diff -M --stat --summary 'HEAD^..'
77 [ -f "../merge-fixes/$tree" ] && {
78 for p in $(cat "../merge-fixes/$tree"); do
79 $(dirname $0)/merge_fix -n "$p" || {
85 d=$(date --date "5 hours ago" '+%Y%m%d')
87 sed -i '$d' $SHA1_FILE
88 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
92 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
93 echo git push failed 1>&2
97 echo "Building using $build_cmd on $build_host"
98 ssh "$build_host" "$build_cmd" || {
99 echo Build failed 1>&2