various updates

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index a8099e4fc1492fb38240443bba666a289bbff295..2a50dcb3bce0f18a67705101aa8e7c0afabb4aeb 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -38,18 +38,36 @@ execute()
 
 cpwd=../next
 
+git update-ref "refs/next/$today/akpm-current" akpm/current
+git branch -f akpm-current/current akpm/current
+
+git branch -f akpm/base HEAD
+
+hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
+log Merging akpm-current/current "($hlog)"
+execute git merge akpm-current/current || {
+       echo Merge failed 1>&2
+       echo $h >>../merge.debug
+       git diff >>../merge.debug 2>&1
+       git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+               bash -i || exit
+       }
+       GIT_EDITOR=: execute git commit -v -a
+       execute git diff -M --stat --summary 'HEAD^..'
+}
+
 execute git clone -s -l -n -q . ../rebase-tmp || {
        echo Clone failed 1>&2
        bash -i || exit
 }
 log '$' cd ../rebase-tmp
 cd ../rebase-tmp
-execute git fetch --no-tags $cpwd refs/heads/quilt/akpm:akpm || {
-       echo Fetch of top failed 1>&2
+execute git fetch --no-tags $cpwd refs/heads/akpm/master:akpm || {
+       echo Fetch of akpm/master failed 1>&2
        bash -i || exit
 }
-execute git fetch --no-tags $cpwd refs/heads/quilt/akpm-base:akpm-base || {
-       echo Fetch of base failed 1>&2
+execute git fetch --no-tags $cpwd refs/heads/akpm/master-base:akpm-base || {
+       echo Fetch of akpm/master-base failed 1>&2
        bash -i || exit
 }
 execute git checkout akpm || {
@@ -60,21 +78,22 @@ execute git rebase --onto master akpm-base || {
        echo Rebase failed 1>&2
        bash -i || exit
 }
-echo "fix up? use git rebase -i --onto master akpm-base"
+echo "fix up?"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
-execute git fetch -f ../rebase-tmp akpm:quilt/akpm || {
+execute git fetch -f ../rebase-tmp akpm:akpm/master || {
        echo Pull failed 1>&2
        bash -i || exit
 }
 execute rm -rf ../rebase-tmp
 
-git update-ref "refs/next/$today/akpm" quilt/akpm
-git update-ref refs/heads/quilt/akpm-base HEAD
+git update-ref "refs/next/$today/akpm" akpm/master
+
+git branch -f akpm/master-base HEAD
 
-log Merging quilt/akpm '('$(git log -1 --oneline quilt/akpm)')'
-execute git merge --no-ff quilt/akpm || {
+log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
+execute git merge --no-ff akpm/master || {
        echo Merge failed 1>&2
        bash -i || exit
 }