Collision branches

[Jonathan Riddell]

On Wed, Oct 05, 2011 at 12:24:44PM -0400, James Westby wrote:
> 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.

I've looked through a bunch and many of them seem to be conflicts
caused by adding a file.  The version uploaded then adds the file to
its own brancha and bzr considers it a conflict (even though the files
are identical), I'd have thought the importer would have some magic to
detect this?

I also found a strange case in python3-defaults where there is nothing to merge, spooky.

There's also several such as checkbox, openssl, gnome-color-manager where I get an error on checking out the moved-aside branch

>bzr branch lp:~ubuntu-branches/ubuntu/oneiric/openssl/oneiric-201110041452
bzr: ERROR: Revision {cjwatson at canonical.com-20111004123628-4ybe8782rytyb0dc} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(None)], []))))".

Jonathan