ninetydegrees: Photo: bingo chips (bingo)
Ninety Degrees (90d) 🌻 ([personal profile] ninetydegrees) wrote in [site community profile] dw_dev_training2012-08-23 01:49 pm

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. :)
kareila: (Default)

[personal profile] kareila 2012-08-23 02:21 pm (UTC)(link)
I would expect the new instructions on http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance to work, but I haven't upgraded my 'hack yet. It may succeed silently?
kareila: (Default)

[personal profile] kareila 2012-08-23 04:05 pm (UTC)(link)
You said you were using PuTTY to get a command line on your Dreamhack, correct? The commands should be used there. Is that what you were confused about?
kareila: (Default)

[personal profile] kareila 2012-08-23 04:20 pm (UTC)(link)
Okay, I think I understand now. If you haven't switched to the new system, you won't be able to pull in the new changes because they're not being posted in the old repository any more. Mark and Fu stopped mirroring the changes in both places after the last code push.

When you were told you could keep working "the old way," that referred specifically to the patch submission process, not the update process. You are still able to submit patches through Bugzilla instead of having to create a Github pull request. But if you want to work against the very latest code, you will need to download it from the git repository.

I'm sorry if this is upsetting for you! I know it's a lot to take in and there hasn't been a lot of communication because the kinks in the process are still being worked out.
yvi: Kaylee half-smiling, looking very pretty (Default)

[personal profile] yvi 2012-08-23 04:24 pm (UTC)(link)
Mark and Fu stopped mirroring the changes in both places after the last code push.


Huh, I totally missed that. I guess I have a lot of work to do before I can actually go back to coding again, then.

Was there an announcement I missed? I'm not seeing anything on [site community profile] dw_dev
Edited 2012-08-23 16:24 (UTC)

(no subject)

[personal profile] kareila - 2012-08-23 16:26 (UTC) - Expand

(no subject)

[personal profile] kareila - 2012-08-23 16:30 (UTC) - Expand

(no subject)

[personal profile] kareila - 2012-08-23 16:42 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 16:55 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 17:12 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 17:25 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 17:34 (UTC) - Expand

(no subject)

[personal profile] fu - 2012-08-23 17:44 (UTC) - Expand

(no subject)

[personal profile] fu - 2012-08-23 18:11 (UTC) - Expand

(no subject)

[personal profile] fu - 2012-08-23 18:22 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 18:32 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 18:22 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 17:45 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 18:27 (UTC) - Expand

(no subject)

[personal profile] foxfirefey - 2012-08-23 18:35 (UTC) - Expand

(no subject)

[personal profile] fu - 2012-08-23 17:15 (UTC) - Expand

(no subject)

[personal profile] fu - 2012-08-23 17:37 (UTC) - Expand
foxfirefey: A seal making a happy face. (happyface)

NEW THREAD

[personal profile] foxfirefey 2012-08-23 06:44 pm (UTC)(link)
Okay, as far as I know now you have a shiny new git-based install that is up to date. And everything is loading and everything.

I am assuming we want to work through what happens when making changes now?
foxfirefey: A wee rat holds a paw to its mouth. Oh, the shock! (myword)

Re: NEW THREAD

[personal profile] foxfirefey 2012-08-23 07:43 pm (UTC)(link)
Hmm, I would not trust the dwu script that is up there yet, it hasn't taken into account some things I have found. (needing to be on an originating branch, etc). I've never used those scripts myself. So I think doing it by hand and seeing how it happens is ideal for now.

I went through the Dev Maintenance first section and changed things based on my experiences. Basically, since you should be doing your changes on their own branches, you'll need to checkout the main develop branch, and then pull from the Dreamwidth repository, then push it back to your Dreamwidth fork. If you could look at the changes I made and see if they make sense, I would much appreciate it.
foxfirefey: A picture of a hand where inked stick figures hug across fingers with a heart above them. (hearts)

Re: NEW THREAD

[personal profile] foxfirefey 2012-08-23 08:03 pm (UTC)(link)
Thank YOU so much. I'll be around at the same times tomorrow for you, okay?

Re: NEW THREAD

[personal profile] foxfirefey - 2012-08-24 19:07 (UTC) - Expand

Re: NEW THREAD

[personal profile] foxfirefey - 2012-08-24 19:15 (UTC) - Expand

Re: NEW THREAD

[personal profile] foxfirefey - 2012-08-24 19:23 (UTC) - Expand

Re: NEW THREAD

[personal profile] swaldman - 2012-09-01 08:46 (UTC) - Expand

Re: NEW THREAD

[personal profile] swaldman - 2012-09-01 12:28 (UTC) - Expand
foxfirefey: A guy looking ridiculous by doing a fashionable posing with a mouse, slinging the cord over his shoulders. (geek)

[personal profile] foxfirefey 2012-08-24 07:01 pm (UTC)(link)
Okay, I've just finished up some additional revamps of Dev Maintenance. I feel a lot more comfortable with these instructions.

I have also made slight changes to the moving instructions that I hope will improve them for folks new to them.
foxfirefey: A wee rat holds a paw to its mouth. Oh, the shock! (thoughtful)

[personal profile] foxfirefey 2012-08-24 07:20 pm (UTC)(link)
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!
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

Re: GitHub Workflow

[personal profile] fu 2012-08-25 01:52 pm (UTC)(link)
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 :)
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

Re: GitHub Workflow

[personal profile] fu 2012-08-25 02:10 pm (UTC)(link)
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

Re: GitHub Workflow

[personal profile] fu - 2012-08-25 14:27 (UTC) - Expand

Re: GitHub Workflow

[personal profile] fu - 2012-08-25 14:35 (UTC) - Expand
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

Re: dw-old?

[personal profile] fu 2012-08-29 10:59 am (UTC)(link)
Nope; only need it if you have patches you haven't transferred over.
denise: Image: Me, facing away from camera, on top of the Castel Sant'Angelo in Rome (Default)

Re: dw-old?

[staff profile] denise 2012-08-29 11:12 am (UTC)(link)
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.