[petsc-dev] nightlybuilds (next vs next-tmp)

Satish Balay balay at mcs.anl.gov
Thu Nov 16 10:03:17 CST 2017

On Wed, 15 Nov 2017, Satish Balay wrote:

> I'm switching the nightlybuild to next-tmp with the following branches for tonight.
> $ git fetch -p && comm -12 <(git branch -r --merged origin/next-tmp | sort) <(git branch -r --no-merged origin/master | sort) |grep -v ' origin/next-tmp'
>   origin/barry/remove-petscdatatype-dmgetworkarray
>   origin/barry/snes-view-display-fd

Merged the above to master.

>   origin/jed/fix-matcreatempibaij/maint

Jed, I attempted to merge to maint - and I get:

$ git merge origin/jed/fix-matcreatempibaij/maint
Auto-merging src/mat/impls/baij/mpi/mpibaij.c
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2601 and retry the command.
Merge made by the 'recursive' strategy.
 src/mat/impls/baij/mpi/mpibaij.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Don't know why - can you take care of this merge?

And I'm switching back builds to next. However - there were a bunch of
breakages from previous build - that needs fixing.



>   origin/knepley/feature-adaptor-plex

More information about the petsc-dev mailing list