3 LOG_FILE="../merge.log"
5 build_dir="/scratch/sfr/next"
6 build_cmd="bin/build_next"
17 rev=$(git show next-${ver}:Next/SHA1s | sed -n "s/^$tree\t\t*//p")
19 echo "No such tree/date" 1>&2
34 echo "$@" | tee -a $LOG_FILE
40 $@ 2>&1 | tee -a $LOG_FILE
41 return ${PIPESTATUS[0]}
44 bad_rev=$(git rev-parse --verify 'HEAD^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')
70 git update-ref "refs/next/$d/broken/$tree" "$bad_rev"
71 git update-ref "refs/next/$d/$tree" "$rev"
75 git push -f "$build_host":"$build_dir" master:refs/heads/next || {
76 echo git push failed 1>&2
80 echo "Building using $build_cmd on $build_host"
81 ssh "$build_host" "$build_cmd" || {
82 echo Build failed 1>&2