[petsc-dev] please fix your bugs in next! error: 'SNESCompositeGetNumber' was not declared in this scope

[Matthew Knepley]

On Tue, Nov 25, 2014 at 1:54 PM, Jed Brown <jed at jedbrown.org> wrote:

> Satish Balay <balay at mcs.anl.gov> writes:
>
> > The relavent commit is:
> >
> >>>>>>>
> > commit 6b2b7f7bcb48548709a46ae3e973244865b14f7a
> > Author: Patrick Farrell <patrick.farrell at imperial.ac.uk>
> > Date:   Thu Nov 20 16:05:42 2014 +0000
> >
> >     Add a function to get the number of subsneses in a SNESCOMPOSITE.
> > <<<<<<<
> > However I don't see the corresponding branch
> >
> >>>>>>>
> > $ git branch -r --contains 6b2b7f7bc
> >   origin/next
> > <<<<<<
> >
> > Looking at next history - I see the merge commit as:
> >
> >>>>>>
> > commit 7deaeafb548c56ebd72003c8eb58fab332a617be
> > Merge: 2ce25a1 6b2b7f7
> > Author: Matthew G. Knepley <knepley at gmail.com>
> > Date:   Thu Nov 20 10:51:43 2014 -0600
> >
> >     Merge remote-tracking branch 'pefarrell/snes-composite-get-number'
> into next
>
> It looks like Matt has a remote named "pefarrell".  One way to bring in
> the remote branch is:
>
>   git fetch pefarrell
> snes-composite-get-number:pefarrell/snes-composite-get-number
>   git merge pefarrell/snes-composite-get-number  # merging to 'next'
>   git push origin pefarrell/snes-composite-get-number next
>

Here is what I put in my config:

[remote "patrick"]
url = git at bitbucket.org:pefarrell/petsc
fetch =
+refs/heads/pefarrell/snes-composite-get-number:refs/remotes/pefarrell/snes-composite-get-number

Then I do

  git fetch patrick

and then

  git checkout next
  git merge pefarrell/snes-composite-get-number

So does your fetch line create a local branch?

   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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20141125/08969af5/attachment.html>