[petsc-dev] PETSc developers who use weird MPI
Satish Balay
balay at mcs.anl.gov
Fri Nov 1 21:59:10 CDT 2013
On Fri, 1 Nov 2013, Barry Smith wrote:
> > If there are dependencies like 'prbrune/sf-sfbasicops ->
> > prbrune/mat-matcolor -> barry/saws ' we need extra effort to keep
> > track of these paths - and make sure the fixes - if any - get
> > propogated the same way.
>
> Like how are we going to do that? Every time someone merges to next I check it and decide if that branch also needs to be merged into all my long living branches. Yeah like that is going to happen.
I don't think you are supporsed to do that unless you specifically need
the features from this branch. And then you keep track of future
fixes - and see if you need to remerge.
> The reason I had to merge all that stuff into saws was that saws could not merge into next because those branches so changed next. I had to merge them into saws before I could get saws into next. But I missed 1/2 a one (somehow) getting an outdated verson of the sf-sfbasics into saws.
>
No the more appropriate thing here would be to merge/rebase to latest
master.
And then attempt to merge saws to next.
Satish
More information about the petsc-dev
mailing list