3 LOG_FILE="../merge.log"
6 build_dir="/scratch/sfr/next"
7 build_cmd="bin/build_next"
18 rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
20 echo "No such tree/date" 1>&2
35 echo "$@" | tee -a $LOG_FILE
41 $@ 2>&1 | tee -a $LOG_FILE
42 return ${PIPESTATUS[0]}
45 bad_rev=$(git rev-parse --verify 'HEAD^2')
47 line="$(tail -n 1 $SHA1_FILE)"
49 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
50 expected=$(printf "%s$tab%s" $tree $bad_rev)
51 [ "$line" = "$expected" ] || {
52 echo "bad last line in $SHA1_FILE" 1>&2
56 GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
57 echo "git reset failed" 1>&2
61 log Merging "$ver version of $tree"
62 execute git merge -m "$ver/$tree" "$rev" || {
63 echo Merge failed 1>&2
64 echo "$ver version of $tree" >>../merge.debug
65 git diff >>../merge.debug 2>&1
66 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
69 GIT_EDITOR=: execute git commit -v -a
70 execute git diff -M --stat --summary 'HEAD^..'
72 [ -f "../merge-fixes/$tree" ] && {
73 for p in $(cat "../merge-fixes/$tree"); do
74 $(dirname $0)/merge_fix -n "$p" || {
80 d=$(date --date "5 hours ago" '+%Y%m%d')
82 sed -i '$d' $SHA1_FILE
83 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
87 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
88 echo git push failed 1>&2
92 echo "Building using $build_cmd on $build_host"
93 ssh "$build_host" "$build_cmd" || {
94 echo Build failed 1>&2