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. http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2017/11/15/examples_full_next.log Satish > origin/knepley/feature-adaptor-plex
