[petsc-dev] candidate branches for master

Karl Rupp rupp at iue.tuwien.ac.at
Thu Feb 27 14:11:39 CST 2014


Hi guys,

 >      > Satish Balay <balay at mcs.anl.gov <mailto:balay at mcs.anl.gov>> 
writes:
>      >
>      > > 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?
>      >
>      > The origin branch detection is messed up when a branch merges to
>     'next'
>      > more than once.  When not dealing with 'maint', I use the much
>     simpler
>      > command:
>      >
>      > comm -12 <(git branch -r --merged next | sort) <(git branch -r
>     --no-merged master | sort)
>
>     Ok. I'll start using the alternative..
>
>
> Did someone rewind master?

Something must be wrong with the detection. In addition to the ones 
mentioned by Matt,
  refs/remotes/origin/karlrupp/update-viennacl-1.5.1
is in master and was merged with this commit:
https://bitbucket.org/petsc/petsc/commits/f57be1c5a183a524a82d1ffd44fbb3c37057e2e0

Best regards,
Karli




More information about the petsc-dev mailing list