creating mps for collisions isn't helpful

Bug #766757 reported by Martin Pool on 2011-04-20
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Ubuntu Distributed Development
High
Jonathan Riddell

Bug Description

At the moment, when the package-importer discovers a divergence between its imports and the package branch, it creates an mp

This has a few problems:

 * The enormous mp is not very useful to the Ubuntu developers who receive it, and probably just noise.
 * The real problem is not to resolve this conflict, but to improve the udd package-importer so that it does not generate non-semantic conflicts.

I don't know all of what is needed to avoid these conflicts, but we can at least start getting a better picture of what's going on, by:

 * logging the conflicts
 * perhaps reporting them on the status page, perhaps matched up to bugs
 * looking into what needs to be done to reduce them

examples:
  <https://code.launchpad.net/~ubuntu-branches/ubuntu/natty/mod-wsgi/natty-201104071155/+merge/56743>.
  https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/gkdebconf/oneiric-201109150915/+merge/75509
  https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/txaws/oneiric-201109152105/+merge/75639
  https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/lxc/oneiric-201109152108/+merge/75640

Martin Pool (mbp) on 2011-04-20
Changed in udd:
assignee: nobody → canonical-bazaar (canonical-bazaar)

The general idea was that conflicts would only be happening when a
developer pushes to the branch and a different developer pushes
directly to the archive. If we're getting massive merge proposals, I
suggest that figuring out why that is happening is important.

The reason for using mps is that:
 - developers didn't want work they have pushed to the branch lost
 - bugs with attachments seemed ugly and less user friendly.

Martin Pool (mbp) wrote :

On 20 April 2011 12:44, Robert Collins <email address hidden> wrote:
> The general idea was that conflicts would only be happening when a
> developer pushes to the branch and a different developer pushes
> directly to the archive. If we're getting massive merge proposals, I
> suggest that figuring out why that is happening is important.

Yes, I know. This bug is towards finding out why, and noticing that
it's happening if it recurs in future.

Martin

Martin Pool (mbp) wrote :

unfortunately https://code.launchpad.net/~ubuntu-branches/+activereviews is intermittent timing out; but post bug 826692 it fails intermittently but not always

Changed in udd:
assignee: canonical-bazaar (canonical-bazaar) → Jonathan Riddell (jr)
description: updated
Martin Pool (mbp) wrote :

bug 867941 for the timeouts

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers