The commit 00199fb220aa173d8585b9e90654dafd3247d82d is the Sage-6.3 release
commit. In other words, there is nothing in that branch.
$ git remote update
$ git log -1
trac/u/elarson3/isogeny_bounds_for_elliptic_curves_over_number_fields
commit 00199fb220aa173d8585b9e90654dafd3247d82d
Author: Volker Braun <vbraun.n...@gmail.com>
Date: Sun Aug 10 12:29:38 2014 +0100
Updated Sage version to 6.3
$ git merge
trac/u/elarson3/isogeny_bounds_for_elliptic_curves_over_number_fields
Already up-to-date.
Not sure where the error in your git merge command comes from. Which git
version do you use?
On Wednesday, August 13, 2014 9:34:40 AM UTC+1, John Cremona wrote:
>
> Can anyone see what is wrong with the branch & commit showing at
> http://trac.sagemath.org/ticket/16806 ? The branch name is not a
> link. In my own clone after doing a "git remote update" I can see the
> branch:
>
> ec@atkin:~/sage (branch: isogs-ecnf)$ git br -r | grep larson
> trac/u/elarson3/isogeny_bounds_for_elliptic_curves_over_number_fields
>
> but when I try
>
> git merge
> trac/u/elarson3/isogeny_bounds_for_elliptic_curves_over_number_fields
>
> to merge it into my own workin gbranch I get the error message
>
> fatal:
> 'trac/u/elarsen3/isogeny_bounds_for_elliptic_curves_over_number_fields'
> does not point to a commit
>
> The author of the branch, Eric Larson, has not used git + sage + trac
> before, and has sent me a copy of the one file changed in his branch,
> so I could make a new branch myself, but it would be more helpful to
> him if someone was able to dignose what went wrong.
>
> John
>
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
