[petsc-dev] *unwind* next branch

Satish Balay balay at mcs.anl.gov
Tue Jun 9 17:48:20 CDT 2015


I've recreated 'next' branch - and have a backup for current 'next' at
'next-jun-2015'.

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.

One way to verify - if you have the 'new' next branch is:
$ git log --oneline v3.6..next|wc -l
1
$ git log --oneline v3.6..next-jun-2015|wc -l
856

[i.e a 'small' number vs a 'huge' number in the diff]. Perhaps Jed has
a better suggestion on this.

The following branches need to be remerged to next.

$ comm -12 <(git branch -r --merged next-jun-2015 | sort) <(git branch -r --no-merged v3.6 | sort)
  origin/jed/assembly-perf
  origin/jed/mat-assembly-perf
  origin/jed/tao-status-string
  origin/karpeev/maint/mat-settype-clear
  origin/next-jun-2015
  origin/pr192/Fande-Kong/scalable-matincreaseoverlap/master
  origin/tisaac/knepley/feature-composable-callbacks


Satish



More information about the petsc-dev mailing list