15 ver=$(git tag -l next-\* | sort | tail -n 1)
18 rev=$(git show ${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
20 echo "No such tree/date" 1>&2
24 . "$(dirname $0)/common.sh"
28 echo "$@" | tee -a $LOG_FILE
34 $@ 2>&1 | tee -a $LOG_FILE
35 return ${PIPESTATUS[0]}
38 bad_rev=$(git rev-parse --verify 'HEAD^2')
40 line="$(tail -n 1 $SHA1_FILE)"
42 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
43 expected=$(printf "%s$tab%s" $tree $bad_rev)
44 [ "$line" = "$expected" ] || {
45 echo "bad last line in $SHA1_FILE" 1>&2
49 GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
50 echo "git reset failed" 1>&2
54 log Merging "$ver version of $tree"
55 execute git merge -m "$ver/$tree" "$rev" || {
56 echo Merge failed 1>&2
57 echo "$ver version of $tree" >>../merge.debug
58 git diff >>../merge.debug 2>&1
59 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
62 GIT_EDITOR=: execute git commit -v -a
63 execute git diff -M --stat --summary 'HEAD^..'
65 [ -f "../merge-fixes/$tree" ] && {
66 for p in $(cat "../merge-fixes/$tree"); do
67 $(dirname $0)/merge_fix -n "$p" || {
73 d=$(date --date "5 hours ago" '+%Y%m%d')
75 sed -i '$d' $SHA1_FILE
76 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
80 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
81 echo git push failed 1>&2
85 "$bin_dir/do_build" || {
86 echo Build failed 1>&2