Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-14 Thread Daniel Bump
I have a branch called: remotes/origin/public/combinat/15361-branching-rules I the repository, switched to this branch, calling the local branch 15361-branching-rules. I did some work, then tried to push. Per the instructions at the tentative conventions page

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-14 Thread Anne Schilling
Hi Dan, Most likely, your local branch is already linked to the remote branch, so a simple git push should suffice. You can see how your local branches are linked, look in your $SAGE_ROOT/.git/config If you want to change the default mapping, you can do git branch 15361-branching-rules

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-14 Thread Volker Braun
git push remote local branch name:remote branch name The remote branch name should just be public/combinat/15361-branching-rules, without the remotes/origin/. You don't have write permissions outside u/bump/* and public/* on the remote. Your local repo has internally a ref called

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-10 Thread Anne Schilling
Dear Dan, Thank you for making the list. I am a little worried that this might actually not catch all dependencies. For example trac_14847-whittaker.patch definitely depends on the functionality of trac_14102-nonsymmetric-macdonald.patch even though they do not touch the same files. Best

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-10 Thread bump
Thank you for making the list. I am a little worried that this might actually not catch all dependencies. For example trac_14847-whittaker.patch definitely depends on the functionality of trac_14102-nonsymmetric-macdonald.patch even though they do not touch the same files. And

[sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Mike Zabrocki
Hi, Sorry I had to leave yesterday during the discussion of the workflow/searching. It seems like you made a lot more progress on the document. I was reading the searching section and I still don't quite see how to tell who wrote the code or who posted: origin/public/combinat/sf/sp_orth I even

[sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Mike Zabrocki
I guess that I should make it clearer that the first time I searched the log with: $ git log to find the commit message by Travis by looking through all of them to find the one relevant to the branch I was interested in. It wasn't until later that I realized that could checkout the branch first

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Anne Schilling
Hi Mike, You can get do the search remotely via $ git log --remotes='origin/public/combinat/sf/sp_orth*' ^origin/master --oneline 8864ef1 Added files. 226c37a Initial version of symplectic and orthogonal basis for symmetric functions. Note there is a * after the name. Best, Anne On 11/9/13

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Mike Zabrocki
Thanks, I thought the * was to complete the name if I didn't know the ending. -Mike -- You received this message because you are subscribed to the Google Groups sage-combinat-devel group. To unsubscribe from this group and stop receiving emails from it, send an email to

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Anne Schilling
Sorry I had to leave yesterday during the discussion of the workflow/searching. It seems like you made a lot more progress on the document. Yes, and more this morning! I will send out an e-mail in a second when the page is semi-stable. One thing that Travis and I tried out in practice after

Re: [sage-combinat-devel] Re: sage-combinat move to git

2013-11-09 Thread Anne Schilling
Dear Sage Days 54 Participants, Thanks again all for coming to Davis and working on the new git workflow together. Andrew and Volker, thank you for coming and teaching us the basics! The overall sentiment was that the new workflow is a great improvement over the old workflow. Soon we won't have

[sage-combinat-devel] Re: sage-combinat move to git

2013-11-04 Thread Simon King
Hi! Meanwhile I got convinced that the change to git and the use of the new Sage development scripts is mostly a very good thing. My advice would be: Look at what the development scripts do. Some of them answer questions you asked. I am only a bit sceptical in one aspect of git resp. the

[sage-combinat-devel] Re: sage-combinat move to git

2013-11-04 Thread Simon King
Hi Nicolas, On 2013-11-04, Nicolas M. Thiery nicolas.thi...@u-psud.fr wrote: - Switching from one branch to the other. As Simon pointed out, this will be easy. However whether it's practical or not will depend on how much time we will have to wait for recompilation in average. Part of