dw_dev_training | Entries tagged with questions

It's been way too long since the last question thread (why didn't anyone poke me?) so let's have another one!

The rules:

- You may ask any dev-related question you have in a comment. (It doesn't even need to be about Dreamwidth, although if it involves a language/library/framework/database Dreamwidth doesn't use, you will probably get answers pointing that out and suggesting a better place to ask.)
- You may also answer any question, using the guidelines given in To Answer, Or Not To Answer.

ninetydegrees

Could someone please explain this entry in simpler terms, preferably with detailed steps? I just don't get it because I have no release branch not stemming from develop so I'm not sure how I should go about creating it (the command given in the entry doesn't work for me obviously as branches on hack are only develop and master).

yvi

So I managed to submit my first pull request \o/

However, i have the following problem, bets described in console output:

dh-yvi@newhack:~/dw$ git checkout develop
Switched to branch 'develop'
Your branch is ahead of 'dreamwidth/develop' by 68 commits.
dh-yvi@newhack:~/dw$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'dreamwidth/master' by 200 commits.

dh-yvi@newhack:~/dw$ git pull dreamwidth develop:develop
Already up-to-date.
dh-yvi@newhack:~/dw$ git pull dreamwidth master:master
From https://github.com/dreamwidth/dw-free
 ! [rejected]        master     -> master  (non-fast-forward)
dh-yvi@newhack:~/dw$ git push origin develop
Everything up-to-date
dh-yvi@newhack:~/dw$ git push origin master
Everything up-to-date

What's going on there?

ninetydegrees

Once your request has been pulled into develop and you've updated develop what do you do with your 'old' branch (local and remote)?

( Read more... )

Answer 1: local can be deleted w/ git branch -d BRANCHNAME (not merge needed yay)

Answer 2: remote can be deleted using git push origin :BRANCHNAME

ninetydegrees

1) If you're working on bug A on branch A then want to work on completely unrelated bug B on branch B, do you need to stash you changes on A checkout develop then create branch B?

Answer: yes, but see comments about using git commit and git commit --amend in your workflow.

2) When can you use git diff? Before add only? Because otherwise it gives me nothing and I have to use git status -v.

Answer: possibly with git diff --cached or git diff HEAD^ HEAD (untested)

3) Oh I feel so stupid for asking this but how do you get out of git diff or git log on PuTTY? Ctrl+C and Ctrl+X don't work.

Answer: the magic key is 'q' and this is related to PAGER and not PuTTY

4) If you're working on bug A on branch A and have reached a point where you want to do some more work but be easily able to revert to where you were before, what is the best route? Several commits? Creating a subbranch A1 (is that possible?)? Is that where merge is useful? I'm having the hardest time understanding how merge can be used concretely.

Answer: several commits is indeed the best route; the concept of 'subbranches' isn't valid.

5) In git config, is there a way to reset the value of core.editor to whatever is the default on your computer (without naming the editor)?

Answer: yes, with git config --global --unset core.editor

pauamma

It's time (more than time, actually) for another question thread!

The rules:

- You may ask any dev-related question you have in a comment. (It doesn't even need to be about Dreamwidth, although if it involves a language/library/framework/database Dreamwidth doesn't use, you will probably get answers pointing that out and suggesting a better place to ask.)
- You may also answer any question, using the guidelines given in To Answer, Or Not To Answer.

Also, since I'm not sure that purplecat got a full answer to their question of last month, can anyone finish answering it?

pauamma

It's time for another question thread!

The rules:

- You may ask any dev-related question you have in a comment. (It doesn't even need to be about Dreamwidth, although if it involves a language/library/framework/database Dreamwidth doesn't use, you will probably get answers pointing that out and suggesting a better place to ask.)
- You may also answer any question, using the guidelines given in To Answer, Or Not To Answer.

pauamma

I just came across To Answer, Or Not To Answer. The gist of it is: someone asked "Should I answer a perl question when I'm not sure of the answer or when I can only answer part of the question?" and got overwhelming "yes" answers (and very good suggestions on how to handle uncertainty), because even if your answer doesn't help the person asking, researching your answer (and thinking about the question) may well help you. So as an experiment, I'd like to try something similar in this entry:

- You may ask any dev-related question you have in a comment. (It doesn't even need to be about Dreamwidth, although if it involves a language/library/framework/database Dreamwidth doesn't use, you will probably get answers pointing that out and suggesting a better place to ask.)
- You may also answer any question, using the guidelines given in the discussion I linked to above.

If this works, I'll try to make it a regular feature of this community. (How often should it happen?)

pauamma

For people using the mq Mercurial plugin in a version that supports multiple queues (I thin Mercurial 1.6 and beyond - check for the qqueue command if you're not sure): Is there a way to have some patches shared between all queues automagically? (Meaning without having to import them manually into each new queue, or to update them everywhere after they were changed somewhere?)

baggyeyes

Hi,

I've been trying to track down where the code is that gives the textarea on options.bml? its character limit. I suspect that it is a .js file. :(

I humbly request of those who may know the answer...where is the code?

I thank you so very much in advance,
okwari

http://bugs.dwscoalition.org/show_bug.cgi?id=200

Current Mood: scared

Profile

Dreamwidth Development Training

May 2013

S	M	T	W	T	F	S
			1	2	3	4
5	6	7	8	9	10	11
12	13	14	15	16	17	18
19	20	21	22	23	24	25
26	27	28	29	30	31

Syndicate

Page Summary

Active Entries

Style Credit

Style:: branchandroot
Resources:: On the Down Low

Expand Cut Tags

No cut tags

Page generated May. 24th, 2013 12:38 pm

Dreamwidth Development Training

Entries tagged with questions

Question thread #9

Git and Release Branch

More git newbie questions

Git: more newbie questions: the sequel

Git: more newbie questions

Question thread #8

Question thread #7

Question thread #6

Question thread #5

Question thread #4

Question thread #3

Question thread #2

Jumping in with questions and answers

Sharing patches between queues

A question about Bug 200

Profile

May 2013

Links

Syndicate

Most Popular Tags

Page Summary

Active Entries

Style Credit

Expand Cut Tags