#15367: Empty lists while creating parents
-------------------------------------+-------------------------------------
       Reporter:  roed               |        Owner:
           Type:  enhancement        |       Status:  needs_review
       Priority:  major              |    Milestone:  sage-5.13
      Component:  coercion           |   Resolution:
       Keywords:                     |    Merged in:
        Authors:  Nils Bruin         |    Reviewers:  Simon King
Report Upstream:  N/A                |  Work issues:
         Branch:                     |       Commit:
  u/nbruin/ticket/15367              |  719cdec176875685142039dce297a7fd8ae4143b
   Dependencies:                     |     Stopgaps:
-------------------------------------+-------------------------------------

Comment (by nbruin):

 It seems that `sage --dev` has a concept of linking a branch with a trac
 ticket, which is convenient. In your case, you already had a branch linked
 with this ticket, so naturally it tried to merge my branch with your local
 one and due to the rebase there really WAS a conflict. Probably there is a
 way to "unlink" your local branch from the ticket, so that `sage --dev
 checkout --ticket=15367` gets you a fresh branch. Similarly I'd hope there
 is a way to locally "reassociate" a branch with a ticket.

 Sorry about the rebase, but in this case it seemed warranted because
  - nothing else depended on the branch
  - There was a big back-and-forth on removing and reintroducing the Eraser
 classes, which would have been silly to archive in the sage history
 (tripling the modification size, or something like that)

 Keeping the trivial edits to `CoercionModel_cache_maps.get_stats()`
 attributed to Simon was an interesting exercise, though.

--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:48>
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