Bug 5722: Critical regression

[donc]

This is a critical wrong-code regression. Should be given top priority, and we should even consider an emergency compiler release.
The code for 'Cat' needs to be copied into D1 as well.

[dnadlinger]

Just a quick suggestion: If you rebase your feature (resp. bugfix) branch on the remote master instead of merging in the changes while privately working on it, there aren't any merge commits cluttering up the commit history (and pull request).

[WalterBright]

Please have separate pull requests for each issue. I don't know how to pull an individual commit, so I just did them manually.

[dnadlinger]

@WalterBright: You can just »fetch« the branch instead of »pull«ing it and then »cherry-pick« the commit you want to have, e.g. »git cherry-pick 66c8899«.

Having separate pull requests for each issue is still a good idea though.

[WalterBright]

Thanks for the tip. Can you give me the exact seqence of commands to do the fetch as well as the cherry-pick? Sorry for my git lameness.

[dnadlinger]

No problem – for this case, you could just do git fetch https://github.com/donc/dmd.git and git cherry-pick 66c8899377, although you might want to set up a proper remote as described on the pull request help page if you expect to pull from the repository in question more than once.

If you are working with GitHub a lot, tools like hub which add GitHub awareness to Git might be interesting for you – they allow you to do things like git fetch donc (without specifying the full path), cherry-pick directly from GitHub commit page URLs, and other nifty syntax sugar.

[walter]

@klickverbot, use @WalterBright instead of my username, please.

[donc]

Have a look at the 'fork queue' on GitHub. You can select individual
commits from the web page. It does all the cherry picking for you --
very very simple.

On 29 March 2011 23:31, WalterBright
reply@reply.github.com
wrote:

Please have separate pull requests for each issue. I don't know how to pull an individual commit, so I just did them manually.

Reply to this email directly or view it on GitHub:
#17 (comment)

[WalterBright]

Thanks, Don, that's what I needed.