[dev-servo] Moving away from merge commits

2016-04-27 Thread Gregory Szorc
Servo developers, I noticed that Servo and a number of other Servo related Git repos have tons of merge commits. This is the Git[Hub] way after all: create a merge commit for every pull request. The thing is, I'm not a huge fan of merge commits in version control, especially for large projects. I

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Josh Matthews
This is something of an opinionated issue among members of the core team. It's something that's been discussed quite a bit on IRC, and formally on the mailing list at https://groups.google.com/forum/#!searchin/mozilla.dev.servo/squash/mozilla.dev.servo/tFCK8dPnPGo/1ZE9QJA_CAAJ .. On 2016-04-2

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Manish Goregaokar
We actually support linear landing in homu, however since github has no way of automarking PRs as "merged" through the API (it only works if the PR actually merged), the support is a bit flaky (it will edit the PR title to say [merged] and close it). I hope this changes soon. I personally prefer

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Matt Brubeck
On Wed, Apr 27, 2016 at 7:25 AM, Manish Goregaokar wrote: > Another reason I prefer merge commits is that it becomes very easy to hunt > down which PR caused a bug (after using blame or pickaxe). We could potentially also make homu add this info (PR# and head commit) to the commit message or he

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Nick Fitzgerald
On Wed, Apr 27, 2016 at 8:34 AM, Matt Brubeck wrote: > On Wed, Apr 27, 2016 at 7:25 AM, Manish Goregaokar > wrote: > > > Another reason I prefer merge commits is that it becomes very easy to > hunt > > down which PR caused a bug (after using blame or pickaxe). > > > We could potentially also mak

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Matt Brubeck
On Tue, Apr 26, 2016 at 11:20 AM, Gregory Szorc wrote: > May I propose Servo change its landing bot to rebase commits instead of > merging them so that the repo history be linear so all the complexities > around merge commits can go away? > Personally I am in favor of this, though I don't feel s

Re: [dev-servo] Moving away from merge commits

2016-04-27 Thread Manish Goregaokar
Yeah, it does, that's what homu does currently. -Manish Goregaokar On Wed, Apr 27, 2016 at 9:08 PM, Nick Fitzgerald wrote: > On Wed, Apr 27, 2016 at 8:34 AM, Matt Brubeck > wrote: > > > On Wed, Apr 27, 2016 at 7:25 AM, Manish Goregaokar < > manishsm...@gmail.com> > > wrote: > > > > > Another r