William Stein <wst...@gmail.com> writes: > Amazingly, after all we went through, I still have a messed up repo > (no master branch). Sigh. > > deep:d wstein$ git branch > 12594 > github-master > lfun > * trac_8393 > > I guess I should just start over.
You almost never need to start over with git. Just `git fetch` from upstream, create a master branch, check it out, and `git reset <commit>` where <commit> is wherever you want master to be pointing. >> Yes, it is pretty >> terrible right now, but that's because we're using patches (not really >> because they are in hg format). Fetching from other git repos to do >> reviews is much, much easier :) > > It's difficult for me because they are patch in hg format, but I can't > export a patch out of git in hg format. It's possible to import the > code in from the trac ticket, but then if I make changes I have to > export them as a git diff, then import them into another hg repo, then > export them again. As far as I can tell -- no easy way to referee a > trac ticket right now using git. I bet it would be possible for a > git wizard to setup some scripts to make this easy. I think doing > so is an important first step toward moving Sage developers to git. I see that as a waste of time. We should create scripts to facilitate a new workflow, not the old one. The average Sage developer should not be encouraged to use git just yet, I think. That is because, as you have noticed, it is downright painful to use git to work on Sage right now. Basically the only advantage right now is the ease of collaboration, which Jason mentioned above. But the solution is not to create scripts that automate this painful process. What we need to do is set up an infrastructure to support a git-based workflow, not create scripts that dumb git down to support our current workflow. (This will be covered in the Workflow SEP.) For non-average Sage developers who for whatever reason want to use git and want to use it *now*, there is a small script displayed on `the github README`_ which may be of use. See also `a recent sage-devel thread`_ (started by you, incidentally) for more advice on how to interoperate with our current system using git. .. _the github README: https://github.com/sagemath/sagelib/wiki .. _a recent sage-devel thread: https://groups.google.com/d/topic/sage-devel/mwY_ju2QWAQ/discussion > then import them into another hg repo, then export them again I have no idea why you need to do this, or think you need to do this. Can you explain? Have you seen the script posted in the above two links? If so, does it not work? As far as I can see, if you do use the git repository of the Sage library, you should have no need to use the Mercurial repository of the Sage library. -Keshav ---- Join us in #sagemath on irc.freenode.net ! -- To post to this group, send an email to sage-devel@googlegroups.com To unsubscribe from this group, send an email to sage-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
