dw_dev_training | Fetching updates on Dreamhack?

Entry tags:

Fetching updates on Dreamhack?

How does one update their repos on their hack now? The 'old' script no longer pulls anything for me (what used to be on http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance) and I don't understand how I can keep up with changes. :/

(Context: I'm on Windows; I use PuTTY and WinSCP).

Edit: ok, if anybody else wonders, short answer is you can no longer update your hack using old methods. :/

Edit 2: long answer is you can switch to the new system. See comments for detailed instructions. :)

Threaded | Top-Level Comments Only

So basically, dw-nonfree is a different repository, and updating it is a separate process from dw-free. If you feel it's better, I can work it into the above, but it's awkward because there might be cases where somebody is working for, say, their clone site and then they don't have dw-nonfree, and we've had people making clone sites start using dw-nonfree before which is awkward.

New users still have to move the old hack--I think Sophie has not yet made a new process for setting up. (It's tricky because of all the account stuff that goes on with Github now.)

I'm assuming by other instructions you mean flow stuff like making a branch, committing changes to it, pushing them up to Github and making a pull request, yes? Because we can make them right now!

I was only working on one style and this is asking me about many, many layers which are for different styles and look like they exist. I'm tempted to say yes actually because it's going to ask me every time. (and yeah I know it sucks when a layer is delete because you have to go create a new style but...).

That's kind of strange then. I haven't had that happen and I'm a bit confused as to why it is popping up for you. And the files exist for those styles?

Maybe make a link? Because as I reread that section I wondered: what about nonfree? I mean, from my POV it's logical to update everything at the same time but I get why you made it separate.

No, I meant all the other instructions on the Moving... page but it was a stupid question because yeah of course.

oh. took a closer look and it looks like these are all nonfree themes so might it be because they changed location with the new folder structure and it can't find them anymore?

I see it's been fixed! Yay! So I'm all up-to-date now and dwdb no longer gives me any error. I also see you made a new page and I'll go through it today hopefully (doesn't matter really) and bother you with any question I have in a new thread. *bg*

Let's start coding!

Ok everything went well (and was so much simpler than before!) so I'm at this point:

Making a pull request

Two questions:

a) Should I do that since we're supposed to be upload patches the True and Tried way (Mark's words :)?

b) If I'm not should I simply generate the diff and upload it as my patch on Zilla? Or do something else?

Yes, make a pull request definitely.

I think that Mark was making a joke about the True and Tried way (or maybe saying that we wouldn't be getting rid of that just yet? I don't remember the context in which he said it)

So yup just make a pull request :)

Ok thanks!

One more question: my original branch didn't have a correct name so I tried to rename it using branch -m. Bad move because now what I see in PuTTY and on GH are different now. On PuTTY everything went fine; On GH it just created a new branch with the name I wanted. How do I get rid of the old branch on GH?

Okay try this:

git branch -r -d origin/OLDBRANCHNAME

Note: the origin is part of it and (probably) shouldn't be changed.

If you want to get a list of all your remote branches to be really sure, do this:

git branch -r

Thanks!
Should I do push origin after that? Because it's still there on GH (but not when I do branch -r).

Oops I gave some wrong info. What I gave you will have made your repository forget about that branch that's on github.

What you actually want is:

git push origin --delete branchname

Victory! Thank you! *mwah*

\o/!

<333

Oh one more question: is there a point in keeping dw-old once you've got everything set up?

Nope; only need it if you have patches you haven't transferred over.

Yippee yay! Thank you!

To add on to what Fu said, though: we're not hurting for space, so i'd leave it for at least a month or so to make sure there's nothing you forgot.

Er, too late. XD But I was 100% sure I didn't have anything on it. I always deleted patches from my queue once I'd uploaded them.

I don't know if you can git to remember the password for ever, but you can definitely make it remember it for 15 minutes so that you don't have to type it more than that often.

On a dreamhack, type

git config --global credential.helper=cache

I have suggested that this be made a system-wide default on dreamhacks, along with some stuff like putting some outputs into colour.

Great minds think alike because I believe Fey has added this to http://wiki.dwscoalition.org/wiki/index.php/Git_settings. *g*

Edited (too early for grammar *yawns*) 2012-09-01 09:06 (UTC)

ah - actually, that was me :-)

XD Sorry I didn't look at the history. Thanks a lot. This is really helpful.

Threaded | Top-Level Comments Only

Page 3 of 3

Fetching updates on Dreamhack?

no subject

Re: NEW THREAD

Re: NEW THREAD

no subject

Re: NEW THREAD

Re: NEW THREAD

GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

Re: GitHub Workflow

dw-old?

Re: dw-old?

Re: dw-old?

Re: dw-old?

Re: dw-old?

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD

Re: NEW THREAD