Collision branches

[James Westby]

On Thu, 8 Sep 2011 14:51:44 +1000, Martin Pool <mbp at canonical.com> wrote:
> I looked into a few of them and they weren't all clearly due to quilt
> problems, but perhaps most of them are (or I didn't understand the
> cause from a glance.)

In order to get some data on this I just looked back at 45 of these from
the last month, and found:

  9 that looked real, or at least feasible
  2 that were caused by updates to .po files
  4 that were caused by automatically generated debian/control files
  1 caused by updates to config.{guess,sub}
  29 caused by quilt interaction

So 64% of these were caused by quilt interactions, and all the other
spurious ones were less than 50% of what's left, indicating that quilt
is the place to focus our efforts to make these merge proposals have
much more signal than noise.

Thanks,

James