[petsc-dev] regarding unwinding next branch.

[Jed Brown]

Satish Balay <balay at mcs.anl.gov> writes:

> On Mon, 15 Sep 2014, Matthew Knepley wrote:
>
>> On Mon, Sep 15, 2014 at 2:36 PM, Barry Smith <bsmith at mcs.anl.gov> wrote:
>> 
>> >
>> >    Ok, get it out of next then, whatever it is.
>> >
>> 
>> If next gets rewound, then this will happen automatically. I am asking
>> Satish.
>
> I was hoping Jed would do it :). [Lot of old branches in next won't
> merge into a new next anymore..]
>
> Per last discussion - we would wait until some of the branches in next
> would graduate.

These are the branches I see remaining.  I think Stefano's can graduate,
as can Satish's.

balay/fix-glibc-2.20_DEFAULT_SOURCE
balay/update-etags
balay/update-hdf5
barry/fix-usage-with-mpidatatypenull
barry/hwloc
hzhang/matmatmult-bugfix
jed/sr-driver4
jed/vecghostgetvalues
karpeev/fix-ksp-pcgasm
knepley/feature-optcontrol-mg
knepley/feature-plex-nasm
knepley/fix-quadrature-order
madams/sr-driver4
mlange05/fix-gmsh-coordinates
paulmullowney/aijcusp-ellpack-fix
prbrune/sf-examplefix
prbrune/snes-ex19vtkoutput
shri/ts-dae-semi-explicit
shri/ts-is-for-differential-variables
shri/ts-powergrid
stefano_zampini/pcbddc-changeofbasis
stefano_zampini/pcbddc_deluxe
stefano_zampini/pcbddc-primalfixes
tisaac/dm-dim-embed-auto
tisaac/thplex
tisaac/thplex-remove-ksp-loop


I'd rather re-merge the branches that should be kept and that merge
without too much trouble.  If something has a huge conflict, it can be
deferred to the author.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140915/605668cb/attachment.sig>