[petsc-users] petsc git next branch *is* unwound!

[Satish Balay]

On Thu, 2 Oct 2014, Satish Balay wrote:

> petsc git users,
> 
> If you are using next branch from git repository for integration or
> testing or working with it in some form - i.e if you have 'next'
> listed by:
> 
> git branch
> 
> Please delete and recreate it. i.e:
> 
> git checkout master
> git branch -D next
> git checkout next
> 
> From my check - the following feature branches are currently in next
> (not yet merged to master).
> 
> Feature branch owners, please remerge your feature branches into to
> next - as you see fit.

BTW: Some of you might want to rebase/cleanup some of the feature branches
before merging to new next.

Also some of these feature branches are from pre-petsc-3.5 timeframe.
So a rebase to latest master might be something to consider. [if they
are still in line for a merge to master]

Satish

> 
> $ comm -12 <(git branch -r --merged next | sort) <(git branch -r --no-merged master | sort)
>   origin/barry/cleanup-blaslapack
>   origin/barry/remove-dreal
>   origin/barry/remove-sidl
>   origin/barry/reuse-hwloc
>   origin/dmeiser/pullrequest-fix-cusp-bjacobi2
>   origin/dmeiser/pullrequest-remove-thrust-py
>   origin/jed/sr-driver4
>   origin/jed/vecghostgetvalues
>   origin/karlrupp/fix-viennacl-veccopy
>   origin/karpeev/fix-ksp-pcgasm
>   origin/knepley/feature-optcontrol-mg
>   origin/knepley/feature-plex-generator-args
>   origin/knepley/feature-plex-nasm
>   origin/knepley/fix-configure-petsc-dep
>   origin/knepley/fix-quadrature-order
>   origin/madams/sr-driver4
>   origin/maint
>   origin/mlange05/fix-gmsh-coordinates
>   origin/next
>   origin/paulmullowney/aijcusp-ellpack-fix
>   origin/prbrune/sf-examplefix
>   origin/prbrune/snes-ex19vtkoutput
>   origin/sarich/fix-tao-jbearing-bqpip
>   origin/shri/ts-dae-semi-explicit
>   origin/shri/ts-is-for-differential-variables
>   origin/shri/ts-powergrid
>   origin/stefano_zampini/matis-preallocation
>   origin/stefano_zampini/pcbddc-changeofbasis
>   origin/stefano_zampini/pcbddc_deluxe
>   origin/tisaac/feature-fe-geom-dim
>   origin/tisaac/plex-flexible-projection
> 
> [obviously remove maint, next from the above list]
> 
> The previous 'next' branch is currently available as 'next-oct-2014' -
> if you need it for any checks/debugging.
> 
> Satish
> 
> 
> 
>