From mboxrd@z Thu Jan 1 00:00:00 1970 From: rgh@roughage.com.au (Richard Heycock) Date: Thu, 31 Jul 2008 16:38:05 +1000 Subject: [sup-talk] sup news (including 0.6 release) In-Reply-To: <1217466178-sup-1370@entry> References: <1217466178-sup-1370@entry> Message-ID: <1217486240-sup-679@wrasse> Excerpts from William Morgan's message of Thu Jul 31 12:10:49 +1000 2008: > Hi all, > > Some news: > > - I've moved Sup over to Gitorious. I don't know that this will > magically spur a continuous stream of bugfixes, but at least now we > have a repo webpage that's not broken. > > If you're running from Git, you should update your repo to pull from > there. > > If you don't have local changes, you can simply reclone it: > git clone git://gitorious.org/sup/mainline.git > > If you want to preserve your local repository, you can do something like: > git remote add gitorious git://gitorious.org/sup/mainline.git > git fetch > > Then for each branch that you want "git pull" to pull from gitorious, > you'll need to do: > git config branch..remote gitorious > git config branch..merge refs/heads/ > > and then check it out and try pulling. If you haven't made any > commits, this should be a fast-forward. > > If you want to call the remote "origin" instead of "gitorious", you'll > just have to remove or rename your origin remote first. The commands > above will be the same. > > Note that I've reset the "next" branch, so if you have commits on that > branch, life may be little more complicated. Doing the above and merging > should work. Or you can isolate your changes somehow and rebase > --onto, if you feel like being complicated. > > - I've merged all outstanding topic branches down to master, and > cherry-picked a couple commits that somehow ended up in next by > themselves. So master should be the latest and greatest for the > moment. > > - I've moved the bugs dir directly into master. The bugs branch is now > deprecated. (It doesn't even exist in the Gitorious repo.) > > - I'm planning on release an 0.6 soon with all the bugfixes we have so > far. To this end, I've unassigned all unclosed issues from the 0.6 > release. > > - Can anyone confirm that that the master branch on gitorious works for > you, just like the next branch did in the old repo? It should, but I > want to double-check before I ship 0.6. Works for me as well. rgh > > That's it! Work continues on STS and I hope to have some kind of > functional code to publish soon. -- +61 (0) 410 646 369 [e]: rgh at neoss.com.au [im]: rgh at jabber.org You're worried criminals will continue to penetrate into cyberspace, and I'm worried complexity, poor design and mismanagement will be there to meet them - Marcus Ranum