[petsc-dev] [petsc-checkbuilds] PETSc blame digest (master) 2015-08-11

[Satish Balay]

This statement doesn't make any sense to me. Perhaps there is some
fundamantal misunderstanding of the feature-branch development
workflow.

The code at issue as added in the commit
https://bitbucket.org/petsc/petsc/commits/7f66b68fbcb45782e0c9b893f85850ff63bc7671
Looks like this commit was done directy on master (yesterday).

And I already pushed a fix to master.
https://bitbucket.org/petsc/petsc/commits/0cf9542a75531c2ab67ebfa2ea06957c067265e8

So this reference to 'I did it just now and put it un my branch'
doesn't make sense. The general rule is:
- any fix that originated in a feature branch should go into that branch
- if that feature branch is merged into maint/master/next - then merge
the feature banch again (with the fix) to the corresponding
maint/master/next branch

And 'that I will merge this week' doesn't make sense wrt workflow - if
there is an issue in master -its best fixed immediately.

And also the a direct fix to 'next' is also a no-no wrt workflow [I
should have done a merge from master to next yesterday - my error]
https://bitbucket.org/petsc/petsc/commits/da1b7514fb5716aa095cad1489e6d6ad1925b456

Now we have the same fix (in different commits) dangling in multiple branches
- one I made directly to master
- one you made directly to next
- one you appear to have in a some feature branch - expected to merge this week.
Not a big deal - but easily avoidable.

Satish

On Wed, 12 Aug 2015, Mark Adams wrote:

> Whoops, I did it just now and put it un my branch, that I will merge this
> week.
> 
> On Tue, Aug 11, 2015 at 11:18 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
> > pushed a fix for this issue.
> >
> > satish
> >
> > On Tue, 11 Aug 2015, PETSc checkBuilds wrote:
> >
> > >
> > >
> > > Dear PETSc developer,
> > >
> > > This email contains listings of contributions attributed to you by
> > > `git blame` that caused compiler errors or warnings in PETSc automated
> > > testing.  Follow the links to see the full log files. Please attempt to
> > fix
> > > the issues promptly or let us know at petsc-dev at mcs.anl.gov if you are
> > unable
> > > to resolve the issues.
> > >
> > > Thanks,
> > >   The PETSc development team
> > >
> > > ----
> > >
> > > warnings attributed to commit
> > https://bitbucket.org/petsc/petsc/commits/7f66b68
> > > fixed style
> > >
> > >   src/ksp/pc/impls/gamg/gamg.c:232
> > >     [
> > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/08/11/build_master_arch-mswin-cxx-cmplx_ps3.log
> > ]
> > >
> >  C:\cygwin\home\sbalay\PETSC~2.CLO\src\ksp\pc\impls\gamg\gamg.c(232) :
> > warning C4804: '%' : unsafe use of type 'bool' in operation
> > >
> > > ----
> > > To opt-out from receiving these messages - send a request to
> > petsc-dev at mcs.anl.gov.
> > >
> >
> >
>