$ git rebase master (I meant *onto* master.) On Oct 17, 2013 12:31 PM, "Jed Brown" <[email protected]> wrote:
> Resent. Phone gmail app is terrible. > On Oct 17, 2013 12:29 PM, "Jed Brown" <[email protected]> wrote: > >> Easiest is to rebase the whole branch into master. The branch does not >> compile at all. Start by fixing the bad commit. (You left 50 occurrences of >> DMPlexGetCoordinateSection after deleting the implementation.) >> On Oct 17, 2013 12:24 PM, "Matthew Knepley" <[email protected]> wrote: >> >>> On Thu, Oct 17, 2013 at 11:42 AM, Jed Brown <[email protected]>wrote: >>> >>>> Satish Balay <[email protected]> writes: >>>> >>>> > Should have included this.. >>>> > >>>> >>>>>>> >>>> > CXX arch-linux-complex-gcov/obj/src/snes/interface/snesut.o >>>> > src/snes/interface/snesut.c: In function ‘PetscErrorCode >>>> SNESSetWorkVecs(SNES, PetscInt)’: >>>> > src/snes/interface/snesut.c:560:34: error: ‘DMGetGlobalVector’ was >>>> not declared in this scope >>>> > ierr = DMGetGlobalVector(dm, &v);CHKERRQ(ierr); >>>> > ^ >>>> > src/snes/interface/snesut.c:562:38: error: ‘DMRestoreGlobalVector’ >>>> was not declared in this scope >>>> > ierr = DMRestoreGlobalVector(dm, &v);CHKERRQ(ierr); >>>> > ^ >>>> >>>> Lots more errors so I reverted this broken branch. >>>> >>>> >>>> >>>> https://bitbucket.org/petsc/petsc/commits/3916af505cb85cf60e830a5c07833606c651ea33 >>>> >>> >>> Now how the fuck am I supposed to work in this branch now? >>> >>> Matt >>> >>> -- >>> What most experimenters take for granted before they begin their >>> experiments is infinitely more interesting than any results to which their >>> experiments lead. >>> -- Norbert Wiener >>> >>
