Satish, please revert the merge to next of my branch dalcinl/add-tsrestart. This branch has fixes that should go to new maint, but now I need to rework the commits, as they introduce new APIs.
On 27 September 2017 at 11:02, Lisandro Dalcin <[email protected]> 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 <[email protected]> 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 > > > > -- > Lisandro Dalcin > ============ > Research Scientist > Computer, Electrical and Mathematical Sciences & Engineering (CEMSE) > Extreme Computing Research Center (ECRC) > King Abdullah University of Science and Technology (KAUST) > http://ecrc.kaust.edu.sa/ > > 4700 King Abdullah University of Science and Technology > al-Khawarizmi Bldg (Bldg 1), Office # 0109 > Thuwal 23955-6900, Kingdom of Saudi Arabia > http://www.kaust.edu.sa > > Office Phone: +966 12 808-0459 -- Lisandro Dalcin ============ Research Scientist Computer, Electrical and Mathematical Sciences & Engineering (CEMSE) Extreme Computing Research Center (ECRC) King Abdullah University of Science and Technology (KAUST) http://ecrc.kaust.edu.sa/ 4700 King Abdullah University of Science and Technology al-Khawarizmi Bldg (Bldg 1), Office # 0109 Thuwal 23955-6900, Kingdom of Saudi Arabia http://www.kaust.edu.sa Office Phone: +966 12 808-0459
