[petsc-dev] *unwind* next branch

Balay, Satish balay at mcs.anl.gov
Tue Sep 26 21:01:45 CDT 2017


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


More information about the petsc-dev mailing list