[petsc-dev] candidate branches for master

[Matthew Knepley]

On Thu, Feb 27, 2014 at 10:36 AM, Matthew Knepley <knepley at gmail.com> wrote:

> On Thu, Feb 27, 2014 at 9:46 AM, Satish Balay <balay at mcs.anl.gov> wrote:
>
>> Current list of branches that are merged to next - but not yet merged to
>> master.
>>
>> Jed, I don't see 'shri/update-SuiteSparse' in this list. Any idea why?
>>
>> $ git branch -r --contains shri/update-SuiteSparse
>>   origin/next
>>   origin/shri/update-SuiteSparse
>>
>> Perhaps there are more branches that are not being listed similarly?
>>
>> Thanks,
>> Satish
>>
>> -----------------------
>> $ candidate-branches next master
>>
>
> Something is wrong.
>

I just remerged these to master. There were no changes, but there were two
weird merge things.

   Matt


> Candidate for master: refs/remotes/origin/balay/add-FC_DEFINE_FLAG Thu Feb
>> 27 10:37:36 2014 -0600
>> Candidate for master: refs/remotes/origin/barry/cleanup-includes Wed Feb
>> 26 21:41:57 2014 -0600
>> Candidate for master: refs/remotes/origin/barry/nonlinearsolvertable Tue
>> Feb 25 18:49:01 2014 -0600
>> Candidate for master: refs/remotes/origin/irving/doc-cleanup Fri Jan 31
>> 23:42:04 2014 -0700
>> Candidate for master: refs/remotes/origin/irving/snes-ex12-cleanup Fri
>> Dec 13 15:24:09 2013 -0800
>> Candidate for master: refs/remotes/origin/jed/pcfieldsplit-getschurpre
>> Wed Feb 26 09:46:16 2014 -0700
>> Candidate for master:
>> refs/remotes/origin/karlrupp/feature-make-includegraph Wed Feb 26 11:35:32
>> 2014 +0100
>> Candidate for master: refs/remotes/origin/karlrupp/update-viennacl-1.5.1
>> Sat Feb 22 21:40:10 2014 +0100
>> Candidate for master: refs/remotes/origin/karpeev/fix-options-init Mon
>> Dec 16 10:41:35 2013 -0600
>> Candidate for master: refs/remotes/origin/knepley/feature-optcontrol-mg
>> Fri Jan 17 11:19:26 2014 -0600
>> Candidate for master: refs/remotes/origin/knepley/fix-dm-clone Wed May 22
>> 13:48:39 2013 -0400
>>
>
> The branch above should be in master
>
>
>> Candidate for master: refs/remotes/origin/knepley/fix-plex-cgns Wed Feb
>> 26 16:59:26 2014 -0600
>> Candidate for master: refs/remotes/origin/knepley/fix-plex-subdm Tue Jun
>> 25 07:18:49 2013 -0600
>>
>
> The branch above should be in master
>
>
>> Candidate for master: refs/remotes/origin/knepley/submesh-declarations
>> Tue May 14 23:55:12 2013 -0500
>>
>
> The branch above should be in master
>
>    Thanks,
>
>       Matt
>
>
>> Candidate for master: refs/remotes/origin/madams/gamg-aggasm Sat Nov 2
>> 15:56:24 2013 -0400
>> Candidate for master: refs/remotes/origin/madams/gamg-coords Tue Dec 10
>> 10:43:41 2013 -0500
>> Candidate for master: refs/remotes/origin/madams/sr-driver4 Fri Oct 25
>> 14:43:12 2013 -0400
>> Candidate for master:
>> refs/remotes/origin/paulmullowney/aijcusp-ellpack-fix Tue Aug 6 10:34:13
>> 2013 -0500
>> Candidate for master: refs/remotes/origin/prbrune/mat-matgetlayouts Tue
>> Feb 11 13:47:01 2014 -0600
>> Candidate for master: refs/remotes/origin/prbrune/matcoloring-fixmpitypes
>> Tue Feb 11 11:07:26 2014 -0600
>> Candidate for master: refs/remotes/origin/prbrune/sf-examplefix Fri Dec
>> 13 11:38:36 2013 -0600
>> Candidate for master: refs/remotes/origin/prbrune/snes-ex19vtkoutput Wed
>> Jul 24 10:40:02 2013 -0500
>> Candidate for master: refs/remotes/origin/prbrune/snes-fixviexampleoutput
>> Sun Sep 8 22:49:17 2013 -0500
>> Candidate for master: refs/remotes/origin/shri/external-package-KLU Thu
>> Feb 13 17:21:35 2014 -0600
>>
>
>
>
> --
> What most experimenters take for granted before they begin their
> experiments is infinitely more interesting than any results to which their
> experiments lead.
> -- Norbert Wiener
>



-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140227/a5dc0deb/attachment.html>