#16295: Faster is_orthogonal_array
-------------------------+-------------------------------------------------
Reporter: | Owner:
ncohen | Status: needs_review
Type: | Milestone: sage-6.3
enhancement | Resolution:
Priority: major | Merged in:
Component: | Reviewers:
combinatorics | Work issues:
Keywords: | Commit:
Authors: | b9f8b0388a8cd333bfaf4160896b09be5550896a
Nathann Cohen | Stopgaps:
Report Upstream: N/A |
Branch: |
u/ncohen/16295 |
Dependencies: |
#16236 |
-------------------------+-------------------------------------------------
Comment (by dimpase):
Replying to [comment:22 brett]:
> Replying to [comment:20 dimpase]:
> > Replying to [comment:17 brett]:
> > > To look at the new code for this patch, I updated master and
develop. Then I tried
> > >
> > > {{{
> > > git checkout u/ncohen/16295
> > > git pull --ff-only trac u/ncohen/16295
> > > }}}
> > >
> >
> > how about doing this without `--ff-only` ?
> >
>
> Ok I tried
>
>
> {{{
> $ git checkout u/ncohen/16295
> Switched to branch 'u/ncohen/16295'
> $ git pull trac u/ncohen/16295
> From trac.sagemath.org:sage
> * branch u/ncohen/16295 -> FETCH_HEAD
> Auto-merging src/sage/schemes/hyperelliptic_curves/monsky_washnitzer.py
> Auto-merging src/sage/combinat/designs/orthogonal_arrays.py
> CONFLICT (content): Merge conflict in
src/sage/combinat/designs/orthogonal_arrays.py
> Auto-merging src/sage/combinat/designs/latin_squares.py
> Auto-merging src/sage/combinat/designs/designs_pyx.pyx
> CONFLICT (add/add): Merge conflict in
src/sage/combinat/designs/designs_pyx.pyx
> Auto-merging src/sage/combinat/designs/block_design.py
> Auto-merging src/module_list.py
> Automatic merge failed; fix conflicts and then commit the result.
> }}}
>
> Have I somehow changed the files? I certainly did not intend to.
are you updating from `develop`? Or `master`?
On the other hand I just tried `git trac pull 12345` (I am using
[https://github.com/sagemath/git-trac-command git-trac-command], which I
would recommend!) it is worked.
Perhaps you should try checking out `develop` and then trying again...
--
Ticket URL: <http://trac.sagemath.org/ticket/16295#comment:24>
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/d/optout.
