[petsc-dev] *unwind* next branch

[Satish Balay]

ref http://lists.mcs.anl.gov/pipermail/petsc-dev/2016-April/019013.html

We are having to unwind 'next' branch as we fear that some commits in
this branch are harder to track.

I've recreated 'next' branch - and have a backup for current 'next' at
'next-may-2016'.

So *all git repo users* (if you have/use 'next' branch in your clone)
- please do the following (in all your git clones):

git checkout master
git fetch
git branch -D next
git checkout next

PETSc integrators (i.e folk with 'push to next/master/maint
access). Please *do not push* to 'next' from a stale next branch in
your clone. I've temporarily locked this branch.  [Please let me know
that you've recreated 'next' in your clone - so I can unlock the
branch]


$ git log --oneline master..next|wc -l
1
$ git log --oneline master..next-may-2016|wc -l
229
[i.e a 'small' number vs a 'huge' number in the diff].


The following branches need to be checked and remerged to next.

$ comm -12 <(git branch -r --merged origin/next-may-2016 | sort) <(git branch -r --no-merged origin/master | sort)
  origin/barry/housekeeping-1
  origin/mark/dm-fixes
  origin/tisaac/dm-project-function-label
  origin/tisaac/plex-descriptive-debug
  origin/tisaac/plex-feature-vec-get-star

Matt, I see a couple of merges in 'next' today - perhaps they are
local branches - and not pushed to bitbucket? If so - you might want
to run the following to determine the branches to re-merge.

comm -12 <(git branch --merged origin/next-may-2016 | sort) <(git branch --no-merged origin/master | sort)

Satish