<div dir="ltr">SO. How to merge <a href="https://bitbucket.org/petsc/petsc/branch/pr192/Fande-Kong/scalable-matincreaseoverlap/master">https://bitbucket.org/petsc/petsc/branch/pr192/Fande-Kong/scalable-matincreaseoverlap/master</a> to my own branch. And then I can fix bugs there, send a pull request. It should be simple, but I do not know.<div><br></div><div>Thanks,</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 16, 2015 at 3:08 PM, Barry Smith <span dir="ltr"><<a href="mailto:bsmith@mcs.anl.gov" target="_blank">bsmith@mcs.anl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Dmitry (duh), you need to tell him how to access that repo from his current location inside his forked clone; it is git mumbo jumbo that you need to tell him and document for future people in this situation.<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
> On Apr 16, 2015, at 4:01 PM, Dmitry Karpeyev <<a href="mailto:karpeev@mcs.anl.gov">karpeev@mcs.anl.gov</a>> wrote:<br>
><br>
> Fande,<br>
><br>
> The branch Barry is referring to was created in the petsc repo (<a href="http://bitbucket.org/petsc/petsc" target="_blank">bitbucket.org/petsc/petsc</a>) and contains some clean up fixes that you need to merge into your branch before working on it further.<br>
><br>
><br>
> Cheers,<br>
> Dmitry.<br>
><br>
> On Thu, Apr 16, 2015 at 3:50 PM Fande Kong <<a href="mailto:fdkong.jd@gmail.com">fdkong.jd@gmail.com</a>> wrote:<br>
> Hi Barry,<br>
><br>
> how to merge the branch pr192/Fande-Kong/scalable-matincreaseoverlap/master to my branch? I did not figure out?<br>
><br>
> reshut2-69-67-dhcp:petsc-matincreaseoverlapnew livia$ git fetch && git checkout pr192/Fande-Kong/scalable-matincreaseoverlap/master<br>
> remote: Counting objects: 3997, done.<br>
> remote: Compressing objects: 100% (2388/2388), done.<br>
> remote: Total 3997 (delta 2758), reused 2837 (delta 1598)<br>
> Receiving objects: 100% (3997/3997), 944.99 KiB | 1.55 MiB/s, done.<br>
> Resolving deltas: 100% (2758/2758), completed with 1147 local objects.<br>
> From <a href="https://bitbucket.org/Fande-Kong/petsc-matincreaseoverlap" target="_blank">https://bitbucket.org/Fande-Kong/petsc-matincreaseoverlap</a><br>
> 56f9468..f1c23e0 master -> origin/master<br>
> error: pathspec 'pr192/Fande-Kong/scalable-matincreaseoverlap/master' did not match any file(s) known to git.<br>
><br>
> Fande,<br>
><br>
> On Wed, Apr 15, 2015 at 4:36 PM, Barry Smith <<a href="mailto:bsmith@mcs.anl.gov">bsmith@mcs.anl.gov</a>> wrote:<br>
><br>
> 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.<br>
><br>
> Barry<br>
><br>
> next is only a place to put stuff for tests; you should never branch off of it or make changes to it directly.<br>
><br>
><br>
> > On Apr 15, 2015, at 4:33 PM, Fande Kong <<a href="mailto:fdkong.jd@gmail.com">fdkong.jd@gmail.com</a>> wrote:<br>
> ><br>
> > Hi Developers,<br>
> ><br>
> > 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.<br>
> ><br>
> > Thanks,<br>
> ><br>
> > Fande,<br>
> ><br>
> > On Wed, Apr 15, 2015 at 8:00 AM, PETSc checkBuilds <<a href="mailto:petsc-checkbuilds@mcs.anl.gov">petsc-checkbuilds@mcs.anl.gov</a>> wrote:<br>
> ><br>
> ><br>
> > Dear PETSc developer,<br>
> ><br>
> > This email contains listings of contributions attributed to you by<br>
> > `git blame` that caused compiler errors or warnings in PETSc automated<br>
> > testing. Follow the links to see the full log files. Please attempt to fix<br>
> > the issues promptly or let us know at <a href="mailto:petsc-dev@mcs.anl.gov">petsc-dev@mcs.anl.gov</a> if you are unable<br>
> > to resolve the issues.<br>
> ><br>
> > Thanks,<br>
> > The PETSc development team<br>
> ><br>
> > ----<br>
> ><br>
> > warnings attributed to commit <a href="https://bitbucket.org/petsc/petsc/commits/9d01615" target="_blank">https://bitbucket.org/petsc/petsc/commits/9d01615</a><br>
> > Rewrite an implementation of matincreaseoverlap<br>
> ><br>
> > src/mat/impls/aij/mpi/mpiov.c:133<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log</a>]<br>
> > "/export/home/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c", line 133: warning: argument #7 is incompatible with prototype:<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log</a>]<br>
> > /sandbox/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c:133:10: error: no matching function for call to 'PetscCommBuildTwoSided'<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log</a>]<br>
> > /sandbox/petsc/petsc.clone-3/src/mat/impls/aij/mpi/mpiov.c:133:10: warning: passing argument 7 of 'PetscCommBuildTwoSided' from incompatible pointer type<br>
> ><br>
> > src/mat/impls/aij/mpi/mpiov.c:169<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-opensolaris-misc_n-gage.log</a>]<br>
> > "/export/home/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c", line 169: warning: argument #7 is incompatible with prototype:<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-pkgs-64idx_thrash.log</a>]<br>
> > /sandbox/petsc/petsc.clone-3/src/mat/impls/aij/mpi/mpiov.c:169:10: warning: passing argument 7 of 'PetscCommBuildTwoSided' from incompatible pointer type<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-linux-cxx-cmplx-pkgs-64idx_churn.log</a>]<br>
> > /sandbox/petsc/petsc.clone-2/src/mat/impls/aij/mpi/mpiov.c:169:10: error: no matching function for call to 'PetscCommBuildTwoSided'<br>
> ><br>
> > src/mat/impls/aij/mpi/mpiov.c:76<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log</a>]<br>
> > C:\cygwin\home\sbalay\PETSC~1.CLO\src\mat\impls\aij\mpi\mpiov.c(76) : warning C4022: 'PetscMemzero' : pointer mismatch for actual parameter 1<br>
> > [<a href="http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log" target="_blank">http://ftp.mcs.anl.gov/pub/petsc/nightlylogs/archive/2015/04/15/build_next_arch-mswin_ps3.log</a>]<br>
> > C:\cygwin\home\sbalay\PETSC~1.CLO\src\mat\impls\aij\mpi\mpiov.c(76) : warning C4090: 'function' : different 'const' qualifiers<br>
> ><br>
> > ----<br>
> > To opt-out from receiving these messages - send a request to <a href="mailto:petsc-dev@mcs.anl.gov">petsc-dev@mcs.anl.gov</a>.<br>
> ><br>
><br>
><br>
<br>
</div></div></blockquote></div><br></div>