#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:108 SimonKing]:
> Usually, the mergetool I am using (meld) just shows me the differences
and lets me decide which to take. However, this time, meld gave me the
impression that the two versions differ by 100%. It did not even show a
single line which is common to both versions.
As far as I understand, that's because both versions were added
independently to their respective branches. So each of the two diffs from
the common ancestor contains a single hunk with the whole contents of the
file, and `merge` doesn't find any common block to remove.
> > Just in cas it helps, I pushed a merge based on this assumption to
`u/mmezzarobba/ticket/15303`.
>
> Thank you. How to access it (with either git or the dev scripts)?
It depends a little bit on your setup, but something like
{{{
git fetch trac u/mmezzarobba/ticket/15303
git checkout u/mmezzarobba/ticket/15303 -m mybranch
}}}
(or `git merge --ff-only u/mmezzarobba/ticket/15303` if you are already on
your ticket branch and want to add the merge commit to that branch) should
work.
Please check that what I did is really what you had in mind!
--
Ticket URL: <http://trac.sagemath.org/ticket/15303#comment:109>
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.
