User: Password:
|
|
Subscribe / Log in / New account

Merge Commits

Merge Commits

Posted Oct 12, 2010 20:30 UTC (Tue) by jberkus (subscriber, #55561)
In reply to: Merge Commits by mingo
Parent article: Lessons from PostgreSQL's Git transition

As I said elsewhere in the article, the goal was to NOT change the current workflow for patch approval. Keep in mind that the PostgreSQL project has a smaller ecosystem than Linux; there's only 26 committers and around 100 active major contributors, so the centralization is not considered a problem.

More importantly, several committers did not even try Git until the migration happened. Before we could even consider changing workflows, all contributors will need to be comfortable with Git. That's at least 6 months off, which really means for the 9.2 development cycle *at the soonest*.

The changes to the Commitfests don't need to be dramatic; in a lot of ways, linking to a git snapshot would be much easier than the current e-mail-and-link-to-archive method. However, when you have people who have 14 years of experience reviewing context-diff patches for the project, they're not going to adjust quickly to another method. And there's no reason to make them adjust quickly, either.


(Log in to post comments)

Merge Commits

Posted Oct 12, 2010 20:50 UTC (Tue) by daglwn (guest, #65432) [Link]

And there's no reason to make them adjust quickly, either.

Oh, but there is. As others have pointed out, a lot of tools rely on various git conventions. It's easy enough to create a context diff from git. That seems like a separate issue from how the merge is actually done. I don't see any reason not to use git's merge power to make life so much easier.

Merge Commits

Posted Oct 13, 2010 11:55 UTC (Wed) by marcH (subscriber, #57642) [Link]

> As I said elsewhere in the article, the goal was to NOT change the current workflow for patch approval.

Considering all the problems you have been through this sounds more than reasonable. One thing at a time. Moreover time just works for you now.

Thanks for a great article.


Copyright © 2017, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds