[petsc-dev] Branch 'next' has been rewound

[Satish Balay]

On Mon, 13 May 2013, Jed Brown wrote:

> == Users ==
> 
> I have rewound the branch 'next' after the release, so it will
> not fast-forward (just this once).  If you have a local 'next' branch,
> you should abandon it and check out a fresh one.  You can do this with
> 
>   $ git checkout master
>   $ git branch -D next   # delete the old branch
>   $ git pull
>   $ git checkout next    # revisit 'next' if you want
> 
> If you are tracking 'master', 'git pull' will be sufficient.


hm. looks like I'll have to do this for all nightlybuild repos.  Is it
ok to do it always everynight [and not just during release]?

Satish

------
$ git diff
diff --git a/bin/maint/startnightly b/bin/maint/startnightly
index e48bfe3..a9b31a1 100755
--- a/bin/maint/startnightly
+++ b/bin/maint/startnightly
@@ -21,7 +21,11 @@ foreach TEST ($*)
       endif
     endif
     echo "Cleaning and updating clone at $USR@$MACH $LOC"
-    $SSH $USR@$MACH $DASHN "cd $LOC ; git checkout -f ${BRANCH}; git pull -q "
+    if ("${BRANCH}" == "master") then
+      $SSH $USR@$MACH $DASHN "cd $LOC ; git checkout -f ${BRANCH}; git pull -q "
+    else
+      $SSH $USR@$MACH $DASHN "cd $LOC ; git checkout -f master; git branch -D ${BRANCH}; git pull -q ; git checkout -f  ${BRANCH}"
+    endif
   else
     rsync -e ssh -az --delete  $pdir/ ${USR}@${MACH}:${LOC}
   endif