On February 1, 2010 4:23:13 PM -0500 Frank Cusack <fcusack@fcusack.com> wrote:
On February 1, 2010 8:37:27 PM +0100 Alan DeKok <aland@deployingradius.com> wrote:
I'm inclined to have more small changes, because it makes any later merge *much* easier. Having a few large changes makes merges annoying.
My experience is the opposite, at least for some values of "large".
I have to amend that a bit. It's always bad to have a single change be "large", regardless if it is to a single file or a changeset that comprises multiple files. Not because it may be difficult to merge, but because it is difficult to review. So I don't disagree with you. But that's a different thing than combining multiple individual patches into a single change. Grouping 22 1-line patches into a single changeset is not large. OTOH submitting them as 22 individual patches belies a naive understanding of source control, and actually makes merging that much more difficult, or at least time consuming. -frank