#15303: Coercion discovery fails to be transitive
-------------------------------------+-------------------------------------
Reporter: nbruin | Owner:
Type: defect | Status: needs_review
Priority: major | Milestone: sage-6.0
Component: coercion | Resolution:
Keywords: | Merged in:
Authors: Simon King | Reviewers:
Report Upstream: N/A | Work issues: Crash in permgroup.py
Branch: | Commit:
u/SimonKing/ticket/15303 | 528a03535447d67f04dc16d0a22cc38def54f9f1
Dependencies: #14711, #15329, | Stopgaps:
#15331 |
-------------------------------------+-------------------------------------
Comment (by mmezzarobba):
Replying to [comment:111 SimonKing]:
> How can I see what you did? I tried `git diff HEAD^2`, but it doesn't
really look like what I expected from resolving a merge conflict, since it
touches stuff that did not conflict.
`git diff HEAD^2` gives you all the differences between one of the parents
(in our case, `master`) and HEAD, without taking into account the other
parent at all. To see the effect of a merge, you can try viewing the
"combined diff" of HEAD and both parents (`git show HEAD`). But this will
omit all files that agree entirely with ''either'' of the parents. Also,
the output will include the parts of the merge that were automatically
resolved.
All I did manually was to choose the version of `morphism.pyx` that looked
more recent, and to merge the imports of `morphism.py` as follows:
{{{
-from sage.categories.homset import Homset
+from sage.categories.homset import Homset, Hom
- from sage.rings.all import is_RingHomomorphism,
is_CommutativeRing,
+ from sage.rings.all import Integer
+ from sage.rings.commutative_ring import is_CommutativeRing
+ from sage.rings.morphism import is_RingHomomorphism
}}}
--
Ticket URL: <http://trac.sagemath.org/ticket/15303#comment:115>
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.
