On Fri, Aug 31, 2012 at 10:04 PM, Barry Smith <bsmith at mcs.anl.gov> wrote:
> On Aug 31, 2012, at 10:02 PM, Matthew Knepley <knepley at gmail.com> wrote: > > > On Fri, Aug 31, 2012 at 10:00 PM, Barry Smith <bsmith at mcs.anl.gov> > wrote: > > > > I put a couple patches in petsc-3.3 can a skilled person (Satish?) > please push them up to petsc-dev ? > > > > We are in deep shit if this takes skill. What is wrong with > > > > hg pull http://petsc.cs.iit.edu/petsc/releases/petsc-3.3 > > I recall seeing lots of emails (which I carefully did not read) and > people being castrated because of conflict-city due to dramatic changes in > field split and maybe bad stuff being merged up to petsc-dev I did want to > get yelled at like other people did. We eventually managed to revert all those changes to fieldsplit, at which point I merged back. Merges should be smooth now. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20120831/0ef83751/attachment.html>
