[petsc-dev] *unwind* next branch

Satish Balay balay at mcs.anl.gov
Mon Apr 25 11:36:01 CDT 2016


ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017804.html

I've recreated 'next' branch - and have a backup for current 'next' at
'next-apr-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

Please *do not push* to 'next' from a stale next branch in your clone.

$ git log --oneline v3.7..next|wc -l
6
$ git log --oneline v3.7..next-apr-2016|wc -l
1445

[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-apr-2016 | sort) <(git branch -r --no-merged origin/master | sort)
  origin/barry/fix-some-clang-warnings
  origin/knepley/feature-fe-nonaffine
  origin/next-apr-2016
  origin/tisaac/dmp4est-feature-mapped-coordinates
  origin/tisaac/fix-ex3-coords

Satish




More information about the petsc-dev mailing list