[petsc-dev] *unwind* next branch

[Satish Balay]

>>>>>>
commit 8e80f76617739c84d1b952f9d3f7b8e359e84079
Merge: b5178cece8 5fbebc36b8
Author: Lisandro Dalcin <dalcinl at gmail.com>
Date:   Tue Sep 26 12:36:39 2017

    Merge branch 'dalcinl/add-tsrestart' into next
<<<<<

Well I was looking for branches that were already tested in next. [i.e
branches that get merged sometime before midnight CST get tested by
9:00AM CST]

And there is always a next release.. [likely in a couple of months -
for some of the currently in progress features]

Jed suggests - updates can go into 3.8.1 - if there are 'no
incompatible interface changes' [but thats harder for me to verify for
non-bugfix changes]

Satish

On Wed, 27 Sep 2017, Lisandro Dalcin wrote:

> I had a branch (PR 755) merged into next BEFORE (by looking at the
> commit list in Bitbucket) the commits related to the release were
> pushed. So this PR did not make in for the new release.
> 
> On 27 September 2017 at 05:01, Balay, Satish <balay at mcs.anl.gov> wrote:
> > ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2016-April/019013.html
> >
> > I've recreated 'next' branch - and have a backup for current 'next' at
> > 'next-sep-2017'.
> >
> > 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
> >
> > Please *do not push* to 'next' from a stale next branch in your clone.
> >
> > $ git log --oneline v3.8..next|wc -l
> > 2
> > $ git log --oneline v3.8..next-sep-2017|wc -l
> > 300
> >
> > [i.e a 'small' number vs a 'huge' number in the diff].
> >
> > Satish
> >
> > ------
> > Ref:currently merged branches in old next
> >
> > $ comm -12 <(git branch -r --merged origin/next-sep-2017 | sort) <(git branch -r --no-merged origin/master | sort)
> >   origin/dalcinl/add-tsrestart
> >   origin/dalcinl/fix-dmplex-draw
> >   origin/hongzh/add-ell-format
> 
> 
> 
>