Issue 7610

[OlioEngr]

I turned the patch at http://d.puremagic.com/issues/show_bug.cgi?id=7610#c2 into a commit (3rd commit). (The 2nd commit was just a reversion of the 1st commit.)

I also ran detab and tolf on the file (4th commit). Since it changed lines that I didn't intend to change, I'm thinking that I shouldn't have run detab/tolf. Are detab and tolf only supposed to be run on dmd, runtime, and phobos files? Let me know, and I should be able to revert the 2nd commit. (I'm still learning how to use GitHub.)

[WalterBright]

The doc files should get tolf, but not detab.

[OlioEngr]

Okay. I reverted the detab/tolf commit. I ran tolf on it, but nothing changed so it must have been okay to begin with.

[alexrp]

Looks good.

[denis-sh]

@OlioEngr, please use rebaseing or cherry-picking to not mess the history with lots of changes/reverts.

You can easily amend last commit (this is instead you first revert) or move branch HEAD to any commit (you may move the HEAD to its parent instead of the second revert).

Dear mergers, once you already spent time to review pull requests, why not to tell a request author to skip all revert/merge commits from the pull?

[WalterBright]

I don't really know what the problem is. I don't see what history was messed with here.

[denis-sh]

I just mean there are 5 commits with the only one unreverted. I'd prefer to not see all this commits when discovering a repo history.

[dnadlinger]

The »official« history of the d-p-l.org repo. For example, say you want to use git blame to find out who last changed a particular line in dcompiler.dd (for example to look for further explanations in the commit message). Now you have to go through two pointless commits which touch the entire file.

Since we are not generating the changelog off the SCM history or something like that, it's only a minor nuisance, but still easily avoidable.

[OlioEngr]

@denis-sh and @klickverbot: I know that I've made it way more complicated than it had to be. I've been using Git for a while, but I've a novice with respective to pull requests. Also, I didn't originally know what I was supposed to with regard to running detab and tolf on the file.

I'm going to close this pull request for now since I don't know how long it's going to take me to get this down to one good commit. I know you most of you guys I'd be easy and would probably only take 1 or 2 commands, but I still have much to learn and it'll likely take me 5-10 commands and some head-scratching time for me to get it down to one useful commit.

Thank you for your help and your patience!

[OlioEngr]

Oh, Walter already merged it!

I'm sorry that I made the official history so complicated. If I do another pull request, I'll be more careful and I'll rebase it if it make mistakes.

[denis-sh]

@OlioEngr, you may want to try TortoiseGit or SmartGit. Using Git without GUI is like a coding in Microsoft Notepad for me. Yes, many people disagree with me here and they should be right because of their experience, but I have never managed to type few sentences as fast as I do few mouse clicks.

You don't need to answer this post to decrease flooding here.