[petsc-dev] managing moving patches in pets 3.3. to petsc-dev?

[Matthew Knepley]

On Fri, Aug 31, 2012 at 10:06 PM, Jed Brown <jedbrown at mcs.anl.gov> wrote:

> 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.
>

We should never ever ever be afraid of our version control system or all is
lost. This has to be
the last time we tolerate craziness in the release that lasts more than an
hour.

   Matt

-- 
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/20120831/933dc9b1/attachment.html>