automate deleting of files

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 35f3f57fc80e876e572af4dbef9e63276ad18150..b86f527739020e7e5e48a07ce4e9f5203fc3bfd2 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -106,11 +106,15 @@ for h in $heads; do
        }
 
        hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
-       log Merging $h "($hlog)"
        old_head=$(git rev-parse HEAD)
-       [ -x "../pre-merge/$tree" ] && {
-               "../pre-merge/$tree" || bash -i || exit
+       [ -f "../pre-merge/$tree" ] && {
+               for p in $(cat "../pre-merge/$tree"); do
+                       "$bin_dir/do_patch" -n "$p" || {
+                               bash -i || exit
+                       }
+               done
        }
+       log Merging $h "($hlog)"
        case "$h" in
        *:*)
                do_rebase $h $tree
@@ -120,11 +124,19 @@ for h in $heads; do
                        echo Merge failed 1>&2
                        echo $h >>../merge.debug
                        git diff >>../merge.debug 2>&1
+                       um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
+                       [ "$um_files" ] && [ -f "../merge-files/$tree" ] && {
+                               rm_files=$(grep -F "$um_files" "../merge-files/$tree")
+                               [ "$rm_files" ] &&
+                                       "$bin_dir/do_rm" $rm_files
+                       }
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                bash -i || exit
                        }
-                       GIT_EDITOR=: execute git commit -v -a
-                       execute git diff -M --stat --summary 'HEAD^..'
+#                      [ "$(git status --porcelain)" ] && {
+                               GIT_EDITOR=: execute git commit -v -a
+                               execute git diff -M --stat --summary 'HEAD^..'
+#                      }
                }
                ;;
        esac
@@ -137,10 +149,7 @@ for h in $heads; do
        }
        tab="\t"
        [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
-       printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
-       [ -x "../pre-build/$tree" ] && {
-               "../pre-build/$tree" || bash -i || exit
-       }
+       printf "%s$tab%s\n" $tree $(git rev-parse "${h/\/*://}") >> $SHA1_FILE
        $no_build && continue
        $need_build || {
                # See if we need to build after merging this tree