On 01/30/2014 09:42 AM, kcrisman wrote:
Volker's last thing makes a lot more sense. What I want to do is to get
back to the "master" or "develop" from there with "sage -dev checkout"
but I guess I need to already have known about the "--branch" parameter
$ ./sage -dev checkout --branch master
On local branch "master" without associated ticket.
# Use "sage --dev merge" to include another ticket/branch.
# Use "sage --dev commit" to save changes into a new commit.
2. What is the output of "git branch"?
$ git branch
master
* ticket/13576
ticket/15693
(well, now it's probably on master since I switched)
I think it would be very useful to have very explicit instructions for
how to create and stay on "develop" from upstream *using the sage -dev
scripts*. I'll eventually figure it out but it's nice to have it within
Sage, again. Unified context.
1. Staying on develop was my personal suggestion. To stay on that, you
will need to run git directly:
$ git checkout -b develop --track origin/develop
(now you are on a local branch called "develop")
2. do your reviewing, etc, and after you are done
$ git checkout develop
- OR -
$ sage --dev checkout --branch develop
$ sage -b
(recompile to get back to the files from develop, assuming you had run
sage -b earlier while reviewing the ticket)
3. If a new development version of sage gets released then run
$ sage -upgrade develop
$ git checkout develop # check out your local branch
$ git status # check if develop is up to date. If not..
$ git rebase origin/develop # ... if not.. do this.
- basu.
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/groups/opt_out.
