#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 SimonKing):
Replying to [comment:109 mmezzarobba]:
> {{{
> 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.
The fetch command worked. However, the rest of it didn't.
{{{
king@linux-etl7:~/Sage/git/sage> git fetch trac u/mmezzarobba/ticket/15303
Enter passphrase for key '/home/king/.ssh/id_rsa':
remote: Counting objects: 161, done.
remote: Compressing objects: 100% (55/55), done.
remote: Total 55 (delta 53), reused 0 (delta 0)
Unpacking objects: 100% (55/55), done.
Von ssh://trac.sagemath.org:2222/sage
* branch u/mmezzarobba/ticket/15303 -> FETCH_HEAD
king@linux-etl7:~/Sage/git/sage> git merge --ff-only
u/mmezzarobba/ticket/15303
fatal: u/mmezzarobba/ticket/15303 - nichts was wir zusammenführen können
king@linux-etl7:~/Sage/git/sage> git checkout u/mmezzarobba/ticket/15303
-m ticket/15303mezzarobba
error: pathspec 'u/mmezzarobba/ticket/15303' did not match any file(s)
known to git.
error: pathspec 'ticket/15303mezzarobba' did not match any file(s) known
to git.
}}}
However, since apparently git decided to assign your branch to FETCH_HEAD,
`git merge --ff-only FETCH_HEAD` seems to work.
--
Ticket URL: <http://trac.sagemath.org/ticket/15303#comment:110>
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.
