X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=0c3684d74887a3e0ceb347faa0963755c3a9f424;hb=69f33d24896cd12634189a4a4c76793b22ba0e07;hp=dc8a88c232532ed717cb9cd7704174fcc71e600e;hpb=2e06b9fa1987fc605256698a9243fd6f3b50d25b;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index dc8a88c..0c3684d 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -32,10 +32,16 @@ git branch -f akpm/base HEAD
 old_head=$(git rev-parse HEAD)
 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
 log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
 	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/akpm-current" ] && {
+		rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
+		[ "$rm_files" ] &&
+			"$bin_dir/do_rm" $rm_files
+	}
 	git diff 2>&1 | egrep -q '<<<<<|^\*' && {
 		bash -i || exit
 	}
@@ -51,9 +57,6 @@ printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $S
 		}
 	done
 }
-[ -x "../pre-build/akpm-current" ] && {
-	"../pre-build/akpm-current" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -61,11 +64,11 @@ $no_build ||
 	[ "$old_head" = "$new_head" ] ||
 	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-	git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+	git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 		echo git push failed 1>&2
 		bash -i || exit
 	}
-	"$bin_dir/do_build" || {
+	"$bin_dir/do_build" akpm-current || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}
@@ -86,6 +89,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
 	bash -i || exit
 }
 echo "fix up?"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -112,9 +116,6 @@ printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
 		}
 	done
 }
-[ -x "../pre-build/akpm" ] && {
-	"../pre-build/akpm" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -122,11 +123,11 @@ $no_build ||
 	[ "$old_head" = "$new_head" ] ||
 	[ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-	git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+	git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
 		echo git push failed 1>&2
 		bash -i || exit
 	}
-	"$bin_dir/do_build" || {
+	"$bin_dir/do_build" akpm || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}