#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: Qiaoyu Yang, Kaui Yu
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/dperkinson/sandpile_revisions | 1852ccc5e3e28aadf4b1766e9d40577d74286780
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by dimpase):
Replying to [comment:42 dperkinson]:
> Yes, I could use some help with rebasing. First, could you please
explain why rebasing has become necessary (so that I can understand better
what is going on)? Next, I actually did manage to rebase once earlier.
At that time, I was told to issue the following commands:
>
> $ git fetch trac develop:develop
> $ git checkout t/18618/sandpile_revisions # If you aren't already
in
> that branch
> $ git merge develop
> $ git commit
> $ make
> $ git trac push
>
> I remember running into complications but foolishly did not record how
things were resolved. My first questions:
>
> 1. Just to be sure, I should issue these commands from my git-trac-
command directory (from where I have been pushing all of my changes). Is
that right?
No, git-trac-command has nothing to do with this, expect that the last
command, `git trac push`, uses functionality enabled
by `git trac` extension to `git`. But this is totally orthogonal to doing
development in git-trac-command directory, which should just host a
reasonably updated version of `git trac`, but nothing else (and you might
need to add it to your PATH, as described in `git trac` docs, but again
this has nothing to do with issuing commands from there...).
You certainly should not do your sandpiles development in this directory.
In fact, your development should just overwrite Sage (beta) release number
whatever...
>
> 2. After issuing the 'git merge develop' command, I get the following
error message:
> ----------------
> error: Your local changes to the following files would be overwritten by
merge:
> src/sage/sandpiles/sandpile.py
> Please, commit your changes or stash them before you can merge.
> Aborting
yes, this might be a symptom of keeping updated files in a wrong place.
> ----------------
> Does this mean I should add my sandpile changes and commit before
entering 'git merge develop'?
Well, certainly you need to commit your local changes before you can do
any git processing on them,
but now I can only guess what exactly is happening with your directories.
Do you even have a Sage source tree in the directory you issue your git
commands from?!
Did you start your revision work from some Sage version under (git)
revision control, or from your own private version, without any
git repo?
--
Ticket URL: <http://trac.sagemath.org/ticket/18618#comment:43>
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.
