#15120: Fix doctest doctests in git layout.
-------------------------------------+-------------------------------------
       Reporter:  robertwb           |        Owner:
           Type:  bug                |       Status:  needs_review
       Priority:  major              |    Milestone:  sage-5.12
      Component:  Doctests           |   Resolution:
       Keywords:                     |    Merged in:
        Authors:  Robert Bradshaw    |    Reviewers:  Volker Braun
Report Upstream:  N/A                |  Work issues:
         Branch:                     |       Commit:
  u/vbraun/ticket/15120              |  e11727c3e33d4f8407324d83e13d69a3e14730f1
   Dependencies:                     |     Stopgaps:
-------------------------------------+-------------------------------------

Comment (by SimonKing):

 Sorry for my lack of knowledge on git. What I did: ./sage -dev switch-
 ticket 15120, followed by "make". Afterwards, ./sage -dev did not work
 (so, I assume that the development scripts are in the master branch, but
 this ticket relies on a version of the master branch that predates the
 development scripts; correct?). Since I still found myself on commit
 6912669, I did git pull, followed by git checkout e11727c. git log told me
 that now everything seems ok, I see Volker's recent addition on top of
 Robert's changes. So, I am now running make ptest.

 But what I don't understand is this:
 {{{
 $ git branch -v
 * (no branch)            e11727c revert the change to .gitignore
   master                 1456c52 Merge branch 'ticket/14482' into public
 /sage-git/master
   public/sage-git/master cf14c84 [behind 578] Merge branch 'ticket/14482'
 into public/sage-git/master
   ticket/15120           6912669 Fix --new option for doctests.
 }}}

 How can I make the branch ticket/15120 point to commit e11727c?

--
Ticket URL: <http://trac.sagemath.org/ticket/15120#comment:22>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, 
and MATLAB

-- 
You received this message because you are subscribed to the Google Groups 
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to