Hi Barry, how to merge the branch pr192/Fande-Kong/scalable-matincreaseoverlap/master to my branch? I did not figure out?
reshut2-69-67-dhcp:petsc-matincreaseoverlapnew livia$ git fetch && git checkout pr192/Fande-Kong/scalable-matincreaseoverlap/master remote: Counting objects: 3997, done. remote: Compressing objects: 100% (2388/2388), done. remote: Total 3997 (delta 2758), reused 2837 (delta 1598) Receiving objects: 100% (3997/3997), 944.99 KiB | 1.55 MiB/s, done. Resolving deltas: 100% (2758/2758), completed with 1147 local objects. >From https://bitbucket.org/Fande-Kong/petsc-matincreaseoverlap 56f9468..f1c23e0 master -> origin/master error: pathspec 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' did not match any file(s) known to git. Fande, On Wed, Apr 15, 2015 at 4:36 PM, Barry Smith <[email protected]> wrote: > > You never never never want to fix anything in the branch next. You can > checkout the branch pr192/Fande-Kong/scalable-matincreaseoverlap/master > which is mentioned in response to your pull request, merge that into your > branch you made the pull request on, then fix stuff there. Then make a new > note on the pull request page saying you have made fixes; then I can merge > them into pr192/Fande-Kong/scalable-matincreaseoverlap/master and then into > next again for more overnight testing. > > Barry > > next is only a place to put stuff for tests; you should never branch off > of it or make changes to it directly. > > > > On Apr 15, 2015, at 4:33 PM, Fande Kong <[email protected]> wrote: > > > > Hi Developers, > > > > I contributed a scalable matincreaseoverlap. But I received this message > about some complier errors and warnings on multiple platforms. I was > wondering if you give an instruction to test all codes on different > platforms. And how could I get a clone of next branch. My code works well > with current development version, but have some compiler warnings and > errors in the next branch. > > > > Thanks, > > > > Fande, > > > > On Wed, Apr 15, 2015 at 8:00 AM, PETSc checkBuilds < > [email protected]> 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 [email protected] if you are > unable > > to resolve the issues. > > > > Thanks, > > The PETSc development team > > > > ---- > > > > warnings attributed to commit > https://bitbucket.org/petsc/petsc/commits/9d01615 > > Rewrite an implementation of matincreaseoverlap > > > > src/mat/impls/aij/mpi/mpiov.c:133 > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log > ] > > "/export/home/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c", > line 133: warning: argument #7 is incompatible with prototype: > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log > ] > > /sandbox/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c:133:10: > error: no matching function for call to 'PetscCommBuildTwoSided' > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log > ] > > /sandbox/petsc/petsc.clone-3/src/mat/impls/aij/mpi/mpiov.c:133:10: > warning: passing argument 7 of 'PetscCommBuildTwoSided' from incompatible > pointer type > > > > src/mat/impls/aij/mpi/mpiov.c:169 > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log > ] > > "/export/home/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c", > line 169: warning: argument #7 is incompatible with prototype: > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log > ] > > /sandbox/petsc/petsc.clone-3/src/mat/impls/aij/mpi/mpiov.c:169:10: > warning: passing argument 7 of 'PetscCommBuildTwoSided' from incompatible > pointer type > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log > ] > > /sandbox/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c:169:10: > error: no matching function for call to 'PetscCommBuildTwoSided' > > > > src/mat/impls/aij/mpi/mpiov.c:76 > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log > ] > > > C:\cygwin\home\sbalay\PETSC~1.CLO\src\mat\impls\aij\mpi\mpiov.c(76) : > warning C4022: 'PetscMemzero' : pointer mismatch for actual parameter 1 > > [ > http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log > ] > > > C:\cygwin\home\sbalay\PETSC~1.CLO\src\mat\impls\aij\mpi\mpiov.c(76) : > warning C4090: 'function' : different 'const' qualifiers > > > > ---- > > To opt-out from receiving these messages - send a request to > [email protected]. > > > >
