Thursday, July 14, 2011

You receive a series to fix an old bug, and the patches apply cleanly to your mainline. It even came with its own test suite to make sure that the fix is correct. It's a maintainer's heaven!

You apply them and run tests, and all seem to go well.

But this series is meant to fix an old bug, so you would want to back-port it on top of an older maintenance branch. After spending some time running "git rebase -i" and resolving conflicts, everything compiles. Victory!

Not so fast. The tests start to fail.

Perhaps you botched the back-porting effort? After merging the older maintenance branch with the series with the tip of the current mainline, you find that it gives the identical result as your earlier attempt to apply the series directly on top of the mainline. There wasn't any mistake in conflict resolution you did.

As I ended up working on some topics around large-ish objects during the last cycle, I may continue to do so during this cycle as well. I am currently looking at a few aspects of pack-objects and fsck.

Queued 19 patches from 8 people.
Made 18 merges to 'master' branch, to include in the next release.
Made 35 merges to 'next' branch for public testing.
Made 2 merges to 'maint' branch, to include in the maintenance release.