Re: [sage-combinat-devel] Re: git question

2014-02-28 Thread Mark Shimozono
Thanks, Volker, This was very helpful. My problems were based on side effects of unnecessary merging of changes from the server (which I mistakenly thought was harmless) although I never issued the merge command directly. --Mark > Like every revision control system, git is just a tool to handl

[sage-combinat-devel] Re: git question

2014-02-28 Thread Volker Braun
Like every revision control system, git is just a tool to handle an immutable history. So whatever you do on your lower branch never affects any other branch *unless* you merge the new changes. So assume you have three branches upper, lower, and master After making a change in lower that you ne

Re: [sage-combinat-devel] Re: git question

2014-02-27 Thread Travis Scrimshaw
Hey Mark, Try running "make build" in your Sage root. I believe the most recent changes require you to update your spkg's (which sage -b does not do). Although I recall that this takes awhile due to some ATLAS changes. Best, Travis -- You received this message because you are subscribed to

Re: [sage-combinat-devel] Re: git question

2014-02-27 Thread Anne Schilling
Hi Mark, Are you basing your code on the master branch or the development branch? If the latest development branch is broken, you should probably report that to sage-devel. Aladin had problems yesterday as well with the latest development version. The latest official version is usual the master b

Re: [sage-combinat-devel] Re: git question

2014-02-27 Thread Mark Shimozono
I was the victim of the bad advice on the page http://wiki.sagemath.org/TentativeConventions#Get_the_latest_official_development_version_of_Sage "Start working on a new feature To start work on a new feature, you should first get latest official development version of Sage, and use that as the

Re: [sage-combinat-devel] Re: git question

2014-02-27 Thread Travis Scrimshaw
I'm not quite sure...perhaps try running "sage -sync-build" because maybe it's using a file that is no longer there? On Thursday, February 27, 2014 12:59:03 PM UTC-8, Mark Shimozono wrote: > > Thanks. > > I'm having the recurring problem of first changing filename.py, > then running > > sage -

Re: [sage-combinat-devel] Re: git question

2014-02-27 Thread Mark Shimozono
Thanks. I'm having the recurring problem of first changing filename.py, then running sage -b and then when I again run sage -t filename.py the error message reflects the old code. Any ideas on what is going wrong? --Mark >AFAIK, you'll need to manually merge in the base (lower) branch in

[sage-combinat-devel] Re: git question

2014-02-27 Thread Travis Scrimshaw
Hey Mark, AFAIK, you'll need to manually merge in the base (lower) branch into the dependent (upper) branch (although only when you need the changes in the base branch) and push the appropriate branch to the server when changes are made. If there's any changes that were not pulled in from the