#19778: McFarland 1973 construction for difference sets
-------------------------------------+-------------------------------------
Reporter: vdelecroix | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-7.0
Component: combinatorial | Resolution:
designs | Merged in:
Keywords: | Reviewers: Nathann Cohen
Authors: Vincent Delecroix | Work issues:
Report Upstream: N/A | Commit:
Branch: public/19778beta2 | e8bc5ca4e90242bb6404c87cd5bcc50c83e49a61
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dimpase):
OK, mea culpa, I have had these #19777 commits merged. However, I cannot
seem to be able to rebase to get rid of them - even if I check out clean
develop, get this public/19778beta2 branch, and try
`git rebase develop -i`, I see
{{{
pick 4d2c2f4 trac #19777: Three new SRGs and db update
pick 93bd357 trac #19777: Convert the other 2-intersection set
pick 14bdcab Trac 19778: McFarland 1973 difference set construction
pick 8bd17be Trac 19778: input blocks
pick b3dd88a Trac 19778: code reorganization in difference_family
pick 04c7acf Trac 19778: get rid of mcfarland_1973_parameters
pick 8fe3844 Trac 19778: input block
pick cf852fa trac #19778: Reviewer's commit
pick b582040 trac #19778: DOI
# Rebase 036455f..e8bc5ca onto 036455f
...
}}}
now I delete the top two lines (the 19777 commits) and proceed, and get
{{{
$ git rebase develop -i
error: could not apply 14bdcab... Trac 19778: McFarland 1973 difference
set construction
...
}}}
which makes no freaking sense to me. Note that for some reason I don't
even see my last commit
from public/19778beta2 (commit e8bc5ca4... "it is now one Ring to rule
them all")
in this list, even though it is duly in the branch.
--
Ticket URL: <http://trac.sagemath.org/ticket/19778#comment:34>
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 https://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
