Another post about moving dreamhack to github

[kimira]

Hi, I haven't done much with my dreamhack in a while, but the recent post made me want to try moving it to github. Only I've become stuck at the very beginning of the process. The wiki page linked me to a page about github which linked me to a crach course on git (as I haven't used it before), and this linked me eventually to a place to download git for my OS (windows) but there are two versions there ("Git for Windows" and "msysGit") and I don't know which one I'm supposed to use.

Comments

[azurelunatic]

Some things are a matter of personal preference, and I suspect this may be one of them.

[fu]

I'd suggest using "Git for Windows. Based on the website, it looks like msysGit is more for people who want to make changes to git itself, and therefore is more complicated.

[jest]

Thanks for posting this. I don't have anything to contribute right now, but I'll probably be following in your footsteps in September so it's nice to have it a little bit mapped out.

[foxfirefey]

It looks like Github has an official Windows client now:

http://windows.github.com/

[foxfirefey]

Hello hello hello!

Okay, so basically: You do not NEED to have git on Windows to do development or update your dreamhack. It might be useful, or convenient, to have it, but it is not necessary.

Going through the process linked on that wiki page involves logging in with PuTTY on Windows and giving commands to your dreamhack.

[exor674]

Should that bit not be linked there, then? Or qualified?

[foxfirefey]

Yeah, you're right, I hate that page that gets linked to. (credential-osxkeychain? useless for Dreamhacks). Revision upcoming.

I just did a heavy revision of Dev Maintenance that I think has a better work flow.

After this I will probably make a temporary page describing development flow in git--

create a new branch
making commits
pushing to Github
pull request
deleting branch after it has been merged into development?

--and then merge the elements into the existing pages to update them. I don't think I can focus on what needs to be described while updating existing pages at the same time.

Once that temporary page is made, I think I can make a good dw_dev post that links to most absolutely needed knowledge, and 90d can help me fill out how to phrase it for newbies in Windows.

[foxfirefey]

Okay, here we go, a better revised instruction set for this:

http://wiki.dwscoalition.org/wiki/index.php/Moving_your_Dreamwidth_installation_to_use_Github

[yvi]

And that's working well for me so far! :)

Only problem right now: using the 'dwu' script for dw-free and nonfree:


dh-yvi@newhack:~/dw$ dwu
Already up-to-date.
Already up-to-date.
Password for 'https://yvi-dw@github.com':
Everything up-to-date
Password for 'https://yvi-dw@github.com':
Everything up-to-date
fatal: 'dreamwidth' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
fatal: 'dreamwidth' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
Password for 'https://yvi-dw@github.com':
Everything up-to-date
Password for 'https://yvi-dw@github.com':
error: src refspec master does not match any.
error: failed to push some refs to 'https://yvi-dw@github.com/yvi-dw/dw-nonfree.git'
dh-yvi@newhack:~/dw$ cd ..

Any ideas?

[fu]

I don't think we've updated the dwu script yet! We're still trying to hash out the particular steps we want to use. If you try the update instructions manually, does that work?

[foxfirefey]

When you do this:

git remote

What is listed?

Also:

git remote show dreamwidth
git remote show origin

I have updated the scripts based on the manual commands but not tried it yet.

[kimira]

Oh, okay. Thanks. That was confusing from that entry about moving which said to set up git first. Maybe I'll just use that github windows client. I guess they must not have updated their own "set up git" page since it linked to that other page which didn't even include that one. :x

PuTTY, I'm used to dealing with. ^__^

[foxfirefey]

I do not like that page at all! I revised the instructions to be much less confusing on that point (I hope), thank you so much for letting me know what you were having trouble with.