[dmd-internals] What is the necessary to increase speed of merging?

[Jonathan M Davis]

On Friday, November 11, 2011 19:25:59 Walter Bright wrote:
> On 11/11/2011 10:50 AM, Brad Roberts wrote:
> > The bigger issue, imho, is Walter's lack of trust in the automated
> > testers.
> Another issue is when I do a pull, and it fails testing. This just happened.
> Things pretty much grind to a halt when that happens. I wish github had an
> "unpull" button.

Git in general doesn't have a way to unpull AFAIK, which would make it rather 
hard for github to do it.

Probably the correct way to handle this if you're trying to avoid ever merging 
in bad pulls is to simply not use the pull button - or at least not use it 
immediately. If you merge the request in manually into a branch on your local 
machine, you can test it there.

For instance, if Kenji had a pull request on a branch named fix, then you could 
do this (9rnsr is Kenji's github ID):

git-checkout -b fix
git-pull git://github.com/9rnsr/dmd fix

This creates a local branch named fix and pulls in Kenji's changes. You then 
run the test suite or whatever else you do to verify the fix. After you're sure 
that they're good, you then either use the button on github or merge the fix 
branch into your master branch and push that into the master repository.

But unfortunately, I'm not aware of any way to automate unmerging. If you 
determined which commits they were, you could revert them one by one, but 
that's the best that I'm aware of - especially if you don't want to rebase 
(which would be very bad to do with the main repository, since that would 
screw up everyone's forks).

- Jonathan M Davis