14 rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
16 echo "No such tree/date" 1>&2
20 . "$(dirname $0)/common.sh"
24 echo "$@" | tee -a $LOG_FILE
30 $@ 2>&1 | tee -a $LOG_FILE
31 return ${PIPESTATUS[0]}
34 bad_rev=$(git rev-parse --verify 'HEAD^2')
36 line="$(tail -n 1 $SHA1_FILE)"
38 [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
39 expected=$(printf "%s$tab%s" $tree $bad_rev)
40 [ "$line" = "$expected" ] || {
41 echo "bad last line in $SHA1_FILE" 1>&2
45 GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
46 echo "git reset failed" 1>&2
50 log Merging "$ver version of $tree"
51 execute git merge -m "$ver/$tree" "$rev" || {
52 echo Merge failed 1>&2
53 echo "$ver version of $tree" >>../merge.debug
54 git diff >>../merge.debug 2>&1
55 git diff 2>&1 | egrep -q '<<<<<|^\*' && {
58 GIT_EDITOR=: execute git commit -v -a
59 execute git diff -M --stat --summary 'HEAD^..'
61 [ -f "../merge-fixes/$tree" ] && {
62 for p in $(cat "../merge-fixes/$tree"); do
63 $(dirname $0)/merge_fix -n "$p" || {
69 d=$(date --date "5 hours ago" '+%Y%m%d')
71 sed -i '$d' $SHA1_FILE
72 printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
76 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
77 echo git push failed 1>&2
81 "$bin_dir/do_build" || {
82 echo Build failed 1>&2