#18618: sandpile revisions
-------------------------------------+-------------------------------------
Reporter: dperkinson | Owner:
Type: enhancement | Status: needs_work
Priority: major | Milestone: sage-6.8
Component: graph theory | Resolution:
Keywords: sandpile | Merged in:
Authors: David Perkinson | Reviewers:
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/dperkinson/sandpile_revisions | 9b10bf5e5372b9f2dcb3dd9857304bb4dc43547e
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dperkinson):
Replying to [comment:22 dperkinson]:
> Replying to [comment:21 tscrim]:
> > Replying to [comment:20 dperkinson]:
> > > Replying to [comment:19 tscrim]:
> > > > Replying to [comment:18 dperkinson]:
> > > > > Should I remove every instance of INPUT for which there is no
input (None) and, separately, every instance of OUTPUT for which there is
no output (None)? The documentation for developers at sagemath.org states
that every function must have an INPUT and OUTPUT statement, and further
that this "is not optional".
> > > >
> > > > *tries to put politics aside* These add clutter to the docstring
and are a ''very'' good exception to the rule. So yes, please remove them.
> > > >
> > >
> > > Just to be completely clear: suppose, for example, that I have a
docstring with None listed under INPUT and integer listed under OUTPUT.
Then I should remove the INPUT section, leaving the OUTPUT section, right?
> >
> > Yes, that is correct.
> >
> > > > > At any rate, for this new version, with my local version of
Sage, all tests passed for "sage -t", and the html and pdf documentation
built without problems.
> > > >
> > > > However there is currently a merge conflict with the latest beta.
So you'll need to rebase it.
> > >
> > > I am new to git, so I could use some guidance here. I have been
working in a directory called git-trac-command. The output from "git
branch" shows two branches: ``master`` and ``t/18618/sandpile_revisions``,
with an asterisk next to the latter. After my initial git push command, I
have modified files in another, separate, copy of sage. When I done
making and testing the revisions, I copy the relevant modified files
(sandpile.py, examples.py, etc.) to git-trac-command/src/sage/sandpiles.
I then run ``./sage -br``, ``git add NEW FILES``, ``git commit``, and
``git trac push``.
> > >
> > > What is the sequence of commands I should enter to resolve the
current conflict? Also, what should I have done originally to have
avoided the conflict?
> > >
> > > Thanks very much for your time and advice!
> >
> > What you'll need to do is the following:
> > {{{
> > $ git fetch <remote_name> develop:develop
> > $ git checkout t/18618/sandpile_revisions # If you aren't already
in that branch
> > $ git merge develop
> >
> > Do the rebasing
> >
> > $ git commit
> > $ make # In the $SAGE_ROOT directory. This will take a
*long* time
> > $ git trac push
> > }}}
> > where `<remote_name>` is likely `origin` (possibly `trac`).
> >
>
> Running "git merge develop" leads to the error:
>
> Automatic merge failed; fix conflicts and then commit the result.
>
> > For rebuilding Sage with the `make`, you might want to do these
beforehand to help speed it up:
> > {{{
> > $ make doc-clean
> > $ export SAGE_NUM_THREADS=n
> > $ export MAKE='make -jn'
> > $ export SAGE_PARALLEL_SPKG_BUILD
> > }}}
> > where `n` is the number of processors on your computer. If it happens
to fail during the doc-building part at the end, don't worry about it.
Oops. Entered "make doc clean" by accident. Advice?
--
Ticket URL: <http://trac.sagemath.org/ticket/18618#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.
