do_merge: sprinkle notify-send's around to help the operator

diff --git a/do_merge b/do_merge
index b86f527739020e7e5e48a07ce4e9f5203fc3bfd2..47e02d8b8af1fda51be79430468a210a21884428 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -110,6 +110,7 @@ for h in $heads; do
        [ -f "../pre-merge/$tree" ] && {
                for p in $(cat "../pre-merge/$tree"); do
                        "$bin_dir/do_patch" -n "$p" || {
+                               notify-send -u critical -t 0 "premerge patch failed"
                                bash -i || exit
                        }
                done
@@ -131,6 +132,7 @@ for h in $heads; do
                                        "$bin_dir/do_rm" $rm_files
                        }
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+                               notify-send -u critical -t 0 "merge failed"
                                bash -i || exit
                        }
 #                      [ "$(git status --porcelain)" ] && {
@@ -143,6 +145,7 @@ for h in $heads; do
        [ -f "../merge-fixes/$tree" ] && {
                for p in $(cat "../merge-fixes/$tree"); do
                        "$bin_dir/merge_fix" -n "$p" || {
+                               notify-send -u critical -t 0 "post merge patch failed"
                                bash -i || exit
                        }
                done
@@ -165,10 +168,12 @@ for h in $heads; do
                continue
        git push -f "$build_host":"$build_dir" master:refs/heads/next || {
                echo git push failed 1>&2
+               notify-send -u critical -t 0 "push failed"
                bash -i || exit
        }
        "$bin_dir/do_build" || {
                echo Build failed 1>&2
+               notify-send -u critical -t 0 "build failed"
                bash -i || exit
        }
        need_build=false