Merge lp:~stub/launchpad/bugsummary into lp:launchpad/db-devel

[Stuart Bishop]

[r=stub][bug=793848]

= Summary =

DB patch is sloooow.

== Proposed fix ==

Make it fast by cut and pasting the original INSERT.

== Pre-implementation notes ==

== Implementation details ==

== Tests ==

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:

blah blah blah

[Stuart Bishop (stub)]

review: Approve (db)

=== modified file 'database/schema/patch-2208-75-0.sql'
--- database/schema/patch-2208-75-0.sql	2011-06-14 17:25:29 +0000
+++ database/schema/patch-2208-75-0.sql	2011-06-17 07:08:54 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 -- Copyright 2011 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -599,3 +600,691 @@
 
 
 INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 75, 0);
+=======
+-- Copyright 2011 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+-- Trash our existing data, which we will rebuild in a minute.
+-- Slony-I doesn't like TRUNCATE noramlly, but OK in a DB patch.
+TRUNCATE BugSummary;
+TRUNCATE BugSummaryJournal;
+
+-- Drop indexes we will rebuild later.
+DROP INDEX bugsummary__dimensions__unique;
+DROP INDEX bugsummary__full__idx;
+
+ALTER TABLE BugSummary
+    -- Add a missing foreign key constraint we were unable to add live.
+    -- Person table is always being read, so locks are never acquired.
+    ADD CONSTRAINT bugsummaryjournal_viewed_by_fkey
+        FOREIGN KEY(viewed_by) REFERENCES Person ON DELETE CASCADE,
+    ADD COLUMN importance integer NOT NULL,
+    ADD COLUMN has_patch boolean NOT NULL,
+    ADD COLUMN fixed_upstream boolean NOT NULL;
+
+ALTER TABLE BugSummaryJournal
+    ADD COLUMN importance integer NOT NULL,
+    ADD COLUMN has_patch boolean NOT NULL,
+    ADD COLUMN fixed_upstream boolean NOT NULL;
+
+DROP VIEW CombinedBugSummary;
+CREATE VIEW CombinedBugSummary AS (
+    SELECT
+        id, count, product, productseries, distribution, distroseries,
+        sourcepackagename, viewed_by, tag, status, milestone,
+        importance, has_patch, fixed_upstream
+    FROM BugSummary
+    UNION ALL
+    SELECT
+        -id as id, count, product, productseries, distribution, distroseries,
+        sourcepackagename, viewed_by, tag, status, milestone,
+        importance, has_patch, fixed_upstream
+    FROM BugSummaryJournal);
+
+
+-- Rebuild the BugSummary data with the new columns.
+INSERT INTO BugSummary (
+    count, product, productseries, distribution, distroseries,
+    sourcepackagename, viewed_by, tag, status, importance, has_patch,
+    fixed_upstream, milestone)
+WITH
+    -- kill dupes
+    relevant_bug AS (SELECT * FROM bug where duplicateof is NULL),
+
+    -- (bug.id, tag) for all bug-tag pairs plus (bug.id, NULL) for all bugs
+    bug_tags AS (
+        SELECT relevant_bug.id, NULL::text AS tag FROM relevant_bug
+        UNION
+        SELECT relevant_bug.id, tag
+        FROM relevant_bug INNER JOIN bugtag ON relevant_bug.id=bugtag.bug),
+
+    -- (bug.id, NULL) for all public bugs + (bug.id, viewer) for all
+    -- (subscribers+assignee) on private bugs
+    bug_viewers AS (
+        SELECT relevant_bug.id, NULL::integer AS person
+        FROM relevant_bug WHERE NOT relevant_bug.private
+        UNION
+        SELECT relevant_bug.id, assignee AS person
+        FROM relevant_bug
+        INNER JOIN bugtask ON relevant_bug.id=bugtask.bug
+        WHERE relevant_bug.private and bugtask.assignee IS NOT NULL
+        UNION
+        SELECT relevant_bug.id, bugsubscription.person
+        FROM relevant_bug INNER JOIN bugsubscription
+            ON bugsubscription.bug=relevant_bug.id WHERE relevant_bug.private),
+
+    -- (bugtask.(bug, product, productseries, distribution, distroseries,
+    -- sourcepackagename, status, milestone) for all bugs + the same with
+    -- sourcepackage squashed to NULL)
+    tasks AS (
+        SELECT
+            bug, product, productseries, distribution, distroseries,
+            sourcepackagename, status, importance,
+            (EXISTS
+                (SELECT TRUE
+                FROM BugTask AS RelatedBugTask
+                WHERE RelatedBugTask.bug = BugTask.bug
+                AND RelatedBugTask.id != BugTask.id
+                AND ((RelatedBugTask.bugwatch IS NOT NULL
+                        AND RelatedBugTask.status IN (17, 25, 30))
+                        OR (RelatedBugTask.product IS NOT NULL
+                            AND RelatedBugTask.bugwatch IS NULL
+                            AND RelatedBugTask.status IN (25, 30))))
+                ) as fixed_upstream, milestone
+        FROM bugtask
+        UNION
+        SELECT DISTINCT ON (
+            bug, product, productseries, distribution, distroseries,
+            sourcepackagename, milestone)
+            bug, product, productseries, distribution, distroseries,
+            NULL::integer as sourcepackagename,
+            status, importance,
+            (EXISTS
+                (SELECT TRUE
+                FROM BugTask AS RelatedBugTask
+                WHERE RelatedBugTask.bug = BugTask.bug
+                AND RelatedBugTask.id != BugTask.id
+                AND ((RelatedBugTask.bugwatch IS NOT NULL
+                        AND RelatedBugTask.status IN (17, 25, 30))
+                        OR (RelatedBugTask.product IS NOT NULL
+                            AND RelatedBugTask.bugwatch IS NULL
+                            AND RelatedBugTask.status IN (25, 30))))
+                ) as fixed_upstream, milestone
+        FROM bugtask where sourcepackagename IS NOT NULL)
+
+    -- Now combine
+    SELECT
+        count(*), product, productseries, distribution, distroseries,
+        sourcepackagename, person, tag, status, importance,
+        latest_patch_uploaded IS NOT NULL AS has_patch, fixed_upstream,
+        milestone
+    FROM relevant_bug
+    INNER JOIN bug_tags ON relevant_bug.id=bug_tags.id
+    INNER JOIN bug_viewers ON relevant_bug.id=bug_viewers.id
+    INNER JOIN tasks on tasks.bug=relevant_bug.id
+    GROUP BY
+        product, productseries, distribution, distroseries,
+        sourcepackagename, person, tag, status, importance, has_patch,
+        fixed_upstream, milestone;
+
+
+
+
+
+
+WITH
+    -- kill dupes
+    relevant_bug AS (SELECT * FROM bug where duplicateof is NULL),
+
+    -- (bug.id, tag) for all bug-tag pairs plus (bug.id, NULL) for all bugs
+    bug_tags AS (
+        SELECT relevant_bug.id, NULL::text AS tag FROM relevant_bug
+        UNION
+        SELECT relevant_bug.id, tag
+        FROM relevant_bug INNER JOIN bugtag ON relevant_bug.id=bugtag.bug),
+    -- (bug.id, NULL) for all public bugs + (bug.id, viewer) for all
+    -- (subscribers+assignee) on private bugs
+    bug_viewers AS (
+        SELECT relevant_bug.id, NULL::integer AS person
+        FROM relevant_bug WHERE NOT relevant_bug.private
+        UNION
+        SELECT relevant_bug.id, assignee AS person
+        FROM relevant_bug
+        INNER JOIN bugtask ON relevant_bug.id=bugtask.bug
+        WHERE relevant_bug.private and bugtask.assignee IS NOT NULL
+        UNION
+        SELECT relevant_bug.id, bugsubscription.person
+        FROM relevant_bug INNER JOIN bugsubscription
+            ON bugsubscription.bug=relevant_bug.id WHERE relevant_bug.private),
+
+    fixed_upstream_tasks AS (
+        SELECT BugTask.id, BugTask.bug FROM BugTask
+        WHERE (
+            (bugwatch IS NOT NULL AND status IN (17, 25, 30))
+            OR (
+                bugwatch IS NULL AND product IS NOT NULL
+                AND status IN (25, 30)))),
+
+    -- (bugtask.(bug, product, productseries, distribution, distroseries,
+    -- sourcepackagename, status, milestone) for all bugs + the same with
+    -- sourcepackage squashed to NULL)
+    tasks AS (
+        SELECT
+            bug, product, productseries, distribution, distroseries,
+            sourcepackagename, status, milestone, importance,
+            EXISTS (
+                SELECT TRUE FROM fixed_upstream_tasks
+                WHERE 
+                    BugTask.bug = fixed_upstream_tasks.bug
+                    AND BugTask.id <> fixed_upstream_tasks.id
+                    ) AS fixed_upstream
+        FROM bugtask
+        UNION
+        SELECT DISTINCT ON (
+            bug, product, productseries, distribution, distroseries,
+            sourcepackagename, milestone)
+            bug, product, productseries, distribution, distroseries,
+            NULL::integer as sourcepackagename,
+            status, milestone, importance,
+            EXISTS (
+                SELECT TRUE FROM fixed_upstream_tasks
+                WHERE
+                    BugTask.bug = fixed_upstream_tasks.bug
+                    AND BugTask.id <> fixed_upstream_tasks.id
+                    ) AS fixed_upstream
+        FROM bugtask where sourcepackagename IS NOT NULL)
+
+    -- Now combine
+    SELECT
+        count(*), product, productseries, distribution, distroseries,
+        sourcepackagename, person, tag, status, milestone, importance,
+        latest_patch_uploaded IS NOT NULL AS has_patch, fixed_upstream
+    FROM relevant_bug
+    INNER JOIN bug_tags ON relevant_bug.id=bug_tags.id
+    INNER JOIN bug_viewers ON relevant_bug.id=bug_viewers.id
+    INNER JOIN tasks on tasks.bug=relevant_bug.id
+    GROUP BY
+        product, productseries, distribution, distroseries,
+        sourcepackagename, person, tag, status, milestone,
+        importance, has_patch, fixed_upstream;
+
+
+-- Rebuild indexes.
+CREATE INDEX bugsummary__full__idx ON BugSummary (
+    tag, status, product, productseries, distribution,
+    distroseries, sourcepackagename, viewed_by, milestone,
+    importance, has_patch, fixed_upstream);
+-- Enforce uniqueness again.
+CREATE UNIQUE INDEX bugsummary__product__unique
+    ON BugSummary(
+        product, status, importance, has_patch, fixed_upstream,
+        COALESCE(tag, ''), COALESCE(milestone, -1), COALESCE(viewed_by, -1))
+    WHERE product IS NOT NULL;
+CREATE UNIQUE INDEX bugsummary__productseries__unique
+    ON BugSummary(
+        productseries, status, importance, has_patch, fixed_upstream,
+        COALESCE(tag, ''), COALESCE(milestone, -1), COALESCE(viewed_by, -1))
+    WHERE productseries IS NOT NULL;
+CREATE UNIQUE INDEX bugsummary__distribution__unique
+    ON BugSummary(
+        distribution, status, importance, has_patch, fixed_upstream,
+        COALESCE(sourcepackagename, -1),
+        COALESCE(tag, ''), COALESCE(milestone, -1), COALESCE(viewed_by, -1))
+    WHERE distribution IS NOT NULL;
+CREATE UNIQUE INDEX bugsummary__distroseries__unique
+    ON BugSummary(
+        distroseries, status, importance, has_patch, fixed_upstream,
+        COALESCE(sourcepackagename, -1),
+        COALESCE(tag, ''), COALESCE(milestone, -1), COALESCE(viewed_by, -1))
+    WHERE distroseries IS NOT NULL;
+
+
+-- Rebuild relevant trigger functions.
+CREATE OR REPLACE FUNCTION bugsummary_journal_ins(d bugsummary)
+RETURNS VOID
+LANGUAGE plpgsql AS
+$$
+BEGIN
+    IF d.count <> 0 THEN
+        INSERT INTO BugSummaryJournal (
+            count, product, productseries, distribution,
+            distroseries, sourcepackagename, viewed_by, tag,
+            status, milestone,
+            importance, has_patch, fixed_upstream)
+        VALUES (
+            d.count, d.product, d.productseries, d.distribution,
+            d.distroseries, d.sourcepackagename, d.viewed_by, d.tag,
+            d.status, d.milestone,
+            d.importance, d.has_patch, d.fixed_upstream);
+    END IF;
+END;
+$$;
+
+COMMENT ON FUNCTION bugsummary_journal_ins(bugsummary) IS
+'Add an entry into BugSummaryJournal';
+
+
+CREATE OR REPLACE FUNCTION bugsummary_rollup_journal() RETURNS VOID
+LANGUAGE plpgsql VOLATILE
+SECURITY DEFINER SET search_path TO public AS
+$$
+DECLARE
+    d bugsummary%ROWTYPE;
+    max_id integer;
+BEGIN
+    -- Lock so we don't content with other invokations of this
+    -- function. We can happily lock the BugSummary table for writes
+    -- as this function is the only thing that updates that table.
+    -- BugSummaryJournal remains unlocked so nothing should be blocked.
+    LOCK TABLE BugSummary IN ROW EXCLUSIVE MODE;
+
+    SELECT MAX(id) INTO max_id FROM BugSummaryJournal;
+
+    FOR d IN
+        SELECT
+            NULL as id,
+            SUM(count),
+            product,
+            productseries,
+            distribution,
+            distroseries,
+            sourcepackagename,
+            viewed_by,
+            tag,
+            status,
+            milestone,
+            importance,
+            has_patch,
+            fixed_upstream
+        FROM BugSummaryJournal
+        WHERE id <= max_id
+        GROUP BY
+            product, productseries, distribution, distroseries,
+            sourcepackagename, viewed_by, tag, status, milestone,
+            importance, has_patch, fixed_upstream
+        HAVING sum(count) <> 0
+    LOOP
+        IF d.count < 0 THEN
+            PERFORM bug_summary_dec(d);
+        ELSIF d.count > 0 THEN
+            PERFORM bug_summary_inc(d);
+        END IF;
+    END LOOP;
+
+    DELETE FROM BugSummaryJournal WHERE id <= max_id;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION bug_summary_dec(bugsummary) RETURNS VOID
+LANGUAGE SQL AS
+$$
+    -- We own the row reference, so in the absence of bugs this cannot
+    -- fail - just decrement the row.
+    UPDATE BugSummary SET count = count + $1.count
+    WHERE
+        product IS NOT DISTINCT FROM $1.product
+        AND productseries IS NOT DISTINCT FROM $1.productseries
+        AND distribution IS NOT DISTINCT FROM $1.distribution
+        AND distroseries IS NOT DISTINCT FROM $1.distroseries
+        AND sourcepackagename IS NOT DISTINCT FROM $1.sourcepackagename
+        AND viewed_by IS NOT DISTINCT FROM $1.viewed_by
+        AND tag IS NOT DISTINCT FROM $1.tag
+        AND status IS NOT DISTINCT FROM $1.status
+        AND milestone IS NOT DISTINCT FROM $1.milestone
+        AND importance IS NOT DISTINCT FROM $1.importance
+        AND has_patch IS NOT DISTINCT FROM $1.has_patch
+        AND fixed_upstream IS NOT DISTINCT FROM $1.fixed_upstream;
+    -- gc the row (perhaps should be garbo but easy enough to add here:
+    DELETE FROM bugsummary
+    WHERE
+        count=0
+        AND product IS NOT DISTINCT FROM $1.product
+        AND productseries IS NOT DISTINCT FROM $1.productseries
+        AND distribution IS NOT DISTINCT FROM $1.distribution
+        AND distroseries IS NOT DISTINCT FROM $1.distroseries
+        AND sourcepackagename IS NOT DISTINCT FROM $1.sourcepackagename
+        AND viewed_by IS NOT DISTINCT FROM $1.viewed_by
+        AND tag IS NOT DISTINCT FROM $1.tag
+        AND status IS NOT DISTINCT FROM $1.status
+        AND milestone IS NOT DISTINCT FROM $1.milestone
+        AND importance IS NOT DISTINCT FROM $1.importance
+        AND has_patch IS NOT DISTINCT FROM $1.has_patch
+        AND fixed_upstream IS NOT DISTINCT FROM $1.fixed_upstream;
+    -- If its not found then someone else also dec'd and won concurrently.
+$$;
+
+CREATE OR REPLACE FUNCTION bug_summary_inc(d bugsummary) RETURNS VOID
+LANGUAGE plpgsql AS
+$$
+BEGIN
+    -- Shameless adaption from postgresql manual
+    LOOP
+        -- first try to update the row
+        UPDATE BugSummary SET count = count + d.count
+        WHERE
+            product IS NOT DISTINCT FROM d.product
+            AND productseries IS NOT DISTINCT FROM d.productseries
+            AND distribution IS NOT DISTINCT FROM d.distribution
+            AND distroseries IS NOT DISTINCT FROM d.distroseries
+            AND sourcepackagename IS NOT DISTINCT FROM d.sourcepackagename
+            AND viewed_by IS NOT DISTINCT FROM d.viewed_by
+            AND tag IS NOT DISTINCT FROM d.tag
+            AND status IS NOT DISTINCT FROM d.status
+            AND milestone IS NOT DISTINCT FROM d.milestone
+            AND importance IS NOT DISTINCT FROM d.importance
+            AND has_patch IS NOT DISTINCT FROM d.has_patch
+            AND fixed_upstream IS NOT DISTINCT FROM d.fixed_upstream;
+        IF found THEN
+            RETURN;
+        END IF;
+        -- not there, so try to insert the key
+        -- if someone else inserts the same key concurrently,
+        -- we could get a unique-key failure
+        BEGIN
+            INSERT INTO BugSummary(
+                count, product, productseries, distribution,
+                distroseries, sourcepackagename, viewed_by, tag,
+                status, milestone,
+                importance, has_patch, fixed_upstream)
+            VALUES (
+                d.count, d.product, d.productseries, d.distribution,
+                d.distroseries, d.sourcepackagename, d.viewed_by, d.tag,
+                d.status, d.milestone,
+                d.importance, d.has_patch, d.fixed_upstream);
+            RETURN;
+        EXCEPTION WHEN unique_violation THEN
+            -- do nothing, and loop to try the UPDATE again
+        END;
+    END LOOP;
+END;
+$$;
+
+COMMENT ON FUNCTION bugsummary_rollup_journal() IS
+'Collate and migrate rows from BugSummaryJournal to BugSummary';
+
+
+CREATE OR REPLACE FUNCTION ensure_bugsummary_temp_journal() RETURNS VOID
+LANGUAGE plpgsql VOLATILE AS
+$$
+DECLARE
+BEGIN
+    CREATE TEMPORARY TABLE bugsummary_temp_journal (
+        LIKE bugsummary ) ON COMMIT DROP;
+    ALTER TABLE bugsummary_temp_journal ALTER COLUMN id DROP NOT NULL;
+EXCEPTION
+    WHEN duplicate_table THEN
+        NULL;
+END;
+$$;
+
+COMMENT ON FUNCTION ensure_bugsummary_temp_journal() IS
+'Create a temporary table bugsummary_temp_journal if it does not exist.';
+
+
+CREATE OR REPLACE FUNCTION bug_summary_temp_journal_ins(d bugsummary)
+RETURNS VOID LANGUAGE plpgsql AS
+$$
+BEGIN
+    INSERT INTO BugSummary_Temp_Journal(
+        count, product, productseries, distribution,
+        distroseries, sourcepackagename, viewed_by, tag,
+        status, milestone, importance, has_patch, fixed_upstream)
+    VALUES (
+        d.count, d.product, d.productseries, d.distribution,
+        d.distroseries, d.sourcepackagename, d.viewed_by, d.tag,
+        d.status, d.milestone, d.importance, d.has_patch, d.fixed_upstream);
+    RETURN;
+END;
+$$;
+
+COMMENT ON FUNCTION bug_summary_temp_journal_ins(bugsummary) IS
+'Insert a BugSummary into the temporary journal';
+
+
+-- Don't need these. Faster to just append rows to the journal
+-- than attempt to update existing rows.
+DROP FUNCTION bug_summary_temp_journal_dec(bugsummary);
+DROP FUNCTION bug_summary_temp_journal_inc(bugsummary);
+
+
+CREATE OR REPLACE FUNCTION bug_summary_flush_temp_journal() RETURNS VOID
+LANGUAGE plpgsql VOLATILE AS
+$$
+DECLARE
+    d bugsummary%ROWTYPE;
+BEGIN
+    -- may get called even though no summaries were made (for simplicity in the
+    -- callers)
+    PERFORM ensure_bugsummary_temp_journal();
+    FOR d IN 
+        SELECT
+            NULL::integer AS id, SUM(count), product, productseries,
+            distribution, distroseries, sourcepackagename,
+            viewed_by, tag, status, milestone,
+            importance, has_patch, fixed_upstream
+        FROM BugSummary_temp_journal
+        GROUP BY
+            product, productseries,
+            distribution, distroseries, sourcepackagename,
+            viewed_by, tag, status, milestone, importance,
+            has_patch, fixed_upstream
+        HAVING SUM(count) <> 0
+    LOOP
+        IF d.count < 0 THEN
+            PERFORM bug_summary_dec(d);
+        ELSE
+            PERFORM bug_summary_inc(d);
+        END IF;
+    END LOOP;
+    TRUNCATE bugsummary_temp_journal;
+END;
+$$;
+
+COMMENT ON FUNCTION bug_summary_flush_temp_journal() IS
+'flush the temporary bugsummary journal into the bugsummary table';
+
+
+CREATE OR REPLACE FUNCTION unsummarise_bug(BUG_ROW bug) RETURNS VOID
+LANGUAGE plpgsql VOLATILE AS
+$$
+DECLARE
+    d bugsummary%ROWTYPE;
+BEGIN
+    PERFORM ensure_bugsummary_temp_journal();
+    FOR d IN SELECT * FROM bugsummary_locations(BUG_ROW) LOOP
+        d.count = -1;
+        PERFORM bug_summary_temp_journal_ins(d);
+    END LOOP;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION summarise_bug(BUG_ROW bug) RETURNS VOID
+LANGUAGE plpgsql VOLATILE AS
+$$
+DECLARE
+    d bugsummary%ROWTYPE;
+BEGIN
+    PERFORM ensure_bugsummary_temp_journal();
+    FOR d IN SELECT * FROM bugsummary_locations(BUG_ROW) LOOP
+        d.count = 1;
+        PERFORM bug_summary_temp_journal_ins(d);
+    END LOOP;
+END;
+$$;
+
+
+CREATE OR REPLACE FUNCTION bug_maintain_bug_summary() RETURNS TRIGGER
+LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path TO public AS
+$$
+BEGIN
+    -- There is no INSERT logic, as a bug will not have any summary
+    -- information until BugTask rows have been attached.
+    IF TG_OP = 'UPDATE' THEN
+        IF OLD.duplicateof IS DISTINCT FROM NEW.duplicateof
+            OR OLD.private IS DISTINCT FROM NEW.private
+            OR (OLD.latest_patch_uploaded IS NULL)
+                <> (NEW.latest_patch_uploaded IS NULL) THEN
+            PERFORM unsummarise_bug(OLD);
+            PERFORM summarise_bug(NEW);
+        END IF;
+
+    ELSIF TG_OP = 'DELETE' THEN
+        PERFORM unsummarise_bug(OLD);
+    END IF;
+
+    PERFORM bug_summary_flush_temp_journal();
+    RETURN NULL; -- Ignored - this is an AFTER trigger
+END;
+$$;
+
+
+CREATE OR REPLACE FUNCTION bugtask_maintain_bug_summary() RETURNS TRIGGER
+LANGUAGE plpgsql VOLATILE SECURITY DEFINER SET search_path TO public AS
+$$
+BEGIN
+    -- This trigger only works if we are inserting, updating or deleting
+    -- a single row per statement.
+
+    -- Unlike bug_maintain_bug_summary, this trigger does not have access
+    -- to the old bug when invoked as an AFTER trigger. To work around this
+    -- we install this trigger as both a BEFORE and an AFTER trigger.
+    IF TG_OP = 'INSERT' THEN
+        IF TG_WHEN = 'BEFORE' THEN
+            PERFORM unsummarise_bug(bug_row(NEW.bug));
+        ELSE
+            PERFORM summarise_bug(bug_row(NEW.bug));
+        END IF;
+        PERFORM bug_summary_flush_temp_journal();
+        RETURN NEW;
+
+    ELSIF TG_OP = 'DELETE' THEN
+        IF TG_WHEN = 'BEFORE' THEN
+            PERFORM unsummarise_bug(bug_row(OLD.bug));
+        ELSE
+            PERFORM summarise_bug(bug_row(OLD.bug));
+        END IF;
+        PERFORM bug_summary_flush_temp_journal();
+        RETURN OLD;
+
+    ELSE
+        IF (OLD.product IS DISTINCT FROM NEW.product
+            OR OLD.productseries IS DISTINCT FROM NEW.productseries
+            OR OLD.distribution IS DISTINCT FROM NEW.distribution
+            OR OLD.distroseries IS DISTINCT FROM NEW.distroseries
+            OR OLD.sourcepackagename IS DISTINCT FROM NEW.sourcepackagename
+            OR OLD.status IS DISTINCT FROM NEW.status
+            OR OLD.importance IS DISTINCT FROM NEW.importance
+            OR OLD.bugwatch IS DISTINCT FROM NEW.bugwatch
+            OR OLD.milestone IS DISTINCT FROM NEW.milestone) THEN
+
+            IF TG_WHEN = 'BEFORE' THEN
+                PERFORM unsummarise_bug(bug_row(OLD.bug));
+                IF OLD.bug <> NEW.bug THEN
+                    PERFORM unsummarise_bug(bug_row(NEW.bug));
+                END IF;
+            ELSE
+                PERFORM summarise_bug(bug_row(OLD.bug));
+                IF OLD.bug <> NEW.bug THEN
+                    PERFORM summarise_bug(bug_row(NEW.bug));
+                END IF;
+            END IF;
+        END IF;
+        PERFORM bug_summary_flush_temp_journal();
+        RETURN NEW;
+    END IF;
+END;
+$$;
+
+
+CREATE OR REPLACE FUNCTION bugsummary_locations(BUG_ROW bug)
+RETURNS SETOF bugsummary LANGUAGE plpgsql AS
+$$
+BEGIN
+    IF BUG_ROW.duplicateof IS NOT NULL THEN
+        RETURN;
+    END IF;
+    RETURN QUERY
+        SELECT
+            CAST(NULL AS integer) AS id,
+            CAST(1 AS integer) AS count,
+            product, productseries, distribution, distroseries,
+            sourcepackagename, person AS viewed_by, tag, status, milestone,
+            importance,
+            BUG_ROW.latest_patch_uploaded IS NOT NULL AS has_patch,
+            (EXISTS (
+                SELECT TRUE FROM BugTask AS RBT
+                WHERE
+                    RBT.bug = tasks.bug
+                    -- This would just be 'RBT.id <> tasks.id', except
+                    -- that the records from tasks are summaries and not
+                    -- real bugtasks, and do not have an id.
+                    AND (RBT.product IS DISTINCT FROM tasks.product
+                        OR RBT.productseries
+                            IS DISTINCT FROM tasks.productseries
+                        OR RBT.distribution IS DISTINCT FROM tasks.distribution
+                        OR RBT.distroseries IS DISTINCT FROM tasks.distroseries
+                        OR RBT.sourcepackagename
+                            IS DISTINCT FROM tasks.sourcepackagename)
+                    -- Flagged as INVALID, FIXCOMMITTED or FIXRELEASED
+                    -- via a bugwatch, or FIXCOMMITTED or FIXRELEASED on
+                    -- the product.
+                    AND ((bugwatch IS NOT NULL AND status IN (17, 25, 30))
+                        OR (bugwatch IS NULL AND product IS NOT NULL
+                            AND status IN (25, 30))))
+                )::boolean AS fixed_upstream
+        FROM bugsummary_tasks(BUG_ROW) AS tasks
+        JOIN bugsummary_tags(BUG_ROW) AS bug_tags ON TRUE
+        LEFT OUTER JOIN bugsummary_viewers(BUG_ROW) AS bug_viewers ON TRUE;
+END;
+$$;
+
+COMMENT ON FUNCTION bugsummary_locations(bug) IS
+'Calculate what BugSummary rows should exist for a given Bug.';
+
+
+CREATE OR REPLACE FUNCTION bugsummary_tasks(BUG_ROW bug)
+RETURNS SETOF bugtask LANGUAGE plpgsql STABLE AS
+$$
+DECLARE
+    bt bugtask%ROWTYPE;
+    r record;
+BEGIN
+    bt.bug = BUG_ROW.id;
+
+    -- One row only for each target permutation - need to ignore other fields
+    -- like date last modified to deal with conjoined masters and multiple
+    -- sourcepackage tasks in a distro.
+    FOR r IN
+        SELECT
+            product, productseries, distribution, distroseries,
+            sourcepackagename, status, milestone, importance, bugwatch
+        FROM BugTask WHERE bug=BUG_ROW.id
+        UNION -- Implicit DISTINCT
+        SELECT
+            product, productseries, distribution, distroseries,
+            NULL, status, milestone, importance, bugwatch
+        FROM BugTask WHERE bug=BUG_ROW.id AND sourcepackagename IS NOT NULL
+    LOOP
+        bt.product = r.product;
+        bt.productseries = r.productseries;
+        bt.distribution = r.distribution;
+        bt.distroseries = r.distroseries;
+        bt.sourcepackagename = r.sourcepackagename;
+        bt.status = r.status;
+        bt.milestone = r.milestone;
+        bt.importance = r.importance;
+        bt.bugwatch = r.bugwatch;
+        RETURN NEXT bt;
+    END LOOP;
+END;
+$$;
+
+COMMENT ON FUNCTION bugsummary_tasks(bug) IS
+'Return all tasks for the bug + all sourcepackagename tasks again with the sourcepackagename squashed';
+
+
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 75, 0);
+>>>>>>> MERGE-SOURCE

=== added file 'lib/lp/bugs/javascript/tests/test_subscriber.js.OTHER'
--- lib/lp/bugs/javascript/tests/test_subscriber.js.OTHER	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/javascript/tests/test_subscriber.js.OTHER	2011-06-17 07:08:54 +0000
@@ -0,0 +1,288 @@
+YUI({
+    base: '../../../../canonical/launchpad/icing/yui/',
+    filter: 'raw', combine: false, fetchCSS: false
+    }).use('test', 'console', 'lp.bugs.subscriber', function(Y) {
+
+var suite = new Y.Test.Suite("lp.bugs.subscriber Tests");
+
+/*
+ * Test that all the parts of the user name
+ * are set when given just a URI.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Subscriber From Simple Config',
+
+    setUp: function() {
+        this.config = {
+            uri: '/~deryck'
+        };
+        this.subscriber = new Y.lp.bugs.subscriber.Subscriber(this.config);
+    },
+
+    tearDown: function() {
+        delete this.config;
+        delete this.subscriber;
+    },
+
+    test_uri_config: function() {
+        Y.Assert.areEqual(
+            '/~deryck',
+            this.subscriber.get('uri'),
+            'User URI should be /~deryck');
+        Y.Assert.areEqual(
+            'deryck',
+            this.subscriber.get('name'),
+            'User name should be deryck');
+        Y.Assert.areEqual(
+            this.subscriber.get('uri'),
+            this.subscriber.get('escaped_uri'),
+            'The escaped user uri should be the same as the unescaped uri.');
+        Y.Assert.isNull(
+            this.subscriber.get('user_node'),
+            'User node should not be known and be null at this point.');
+        Y.Assert.areSame(
+            '',
+            this.subscriber.get('css_name'),
+            'Without subscriber_ids object, css_name should not be set yet.');
+        Y.Assert.areSame(
+            '',
+            this.subscriber.get('display_name'),
+            'Without user node or client, the display name should be empty.');
+    }
+}));
+
+/*
+ * Test that all the parts of the user name
+ * are set correctly when a name needs escaping.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Escaping Subscriber From Simple Config',
+
+    setUp: function() {
+        this.config = {
+            uri: '/~foo+bar',
+            subscriber_ids: {'foo+bar': 'subscriber-16'}
+        };
+        this.subscriber = new Y.lp.bugs.subscriber.Subscriber(this.config);
+    },
+
+    tearDown: function() {
+        delete this.config;
+        delete this.subscriber;
+    },
+
+    test_escaping_uri_config: function() {
+        Y.Assert.areEqual(
+            '/~foo+bar',
+            this.subscriber.get('uri'),
+            'User URI should be /~foo+bar');
+        Y.Assert.areEqual(
+            'foo+bar',
+            this.subscriber.get('name'),
+            'User name should be foo+bar');
+        Y.Assert.areEqual(
+            '/~foo%2Bbar',
+            this.subscriber.get('escaped_uri'),
+            'Escaped user URI should be /~foo%2Bbar');
+        Y.Assert.areEqual(
+            'subscriber-16',
+            this.subscriber.get('css_name'),
+            'css_name for user should be subscriber-16');
+    }
+}));
+
+/*
+ * Test that the display_name is correctly worked out
+ * when passed a Node.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Subscriber Name When Passed Node',
+
+    setUp: function() {
+        var node = Y.one('.subscriber-tester');
+        this.config = {
+            uri: '/~tester',
+            user_node: node
+        };
+        this.subscriber = new Y.lp.bugs.subscriber.Subscriber(this.config);
+    },
+
+    tearDown: function() {
+        delete this.config;
+        delete this.subscriber;
+    },
+
+    test_display_name: function() {
+        Y.Assert.areEqual(
+            'JS Test User',
+            this.subscriber.get('display_name'),
+            'The user name should be JS Test User.');
+    }
+}));
+
+/*
+ * Test that display_name is correctly worked out from
+ * the DOM when not passed a Node.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Subscriber Name When Not Passed Node',
+
+    setUp: function() {
+        this.config = {
+            uri: '/~tester'
+        };
+        this.subscriber = new Y.lp.bugs.subscriber.Subscriber(this.config);
+    },
+
+    tearDown: function() {
+        delete this.config;
+        delete this.subscriber;
+    },
+
+    test_display_name_from_dom: function() {
+        Y.Assert.areEqual(
+            'JS Test User',
+            this.subscriber.get('display_name'),
+            'The user name should be JS Test User.');
+    }
+}));
+
+/*
+ * Subscriber class that stubs out API calls.
+ */
+function APIStubSubscriber(config) {
+    APIStubSubscriber.superclass.constructor.apply(this, arguments);
+}
+Y.extend(APIStubSubscriber, Y.lp.bugs.subscriber.Subscriber, {
+    get_display_name_from_api: function(client) {
+        this.set('display_name', 'From API');
+        this.set_truncated_display_name();
+    }
+});
+
+/*
+ * Test that the API is consulted when the display_name cannot be
+ * worked out from a given Node or the DOM.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Subscriber Name From API',
+
+    setUp: function() {
+        // LP is global.
+        window.LP = {
+            cache: {},
+            links: {}
+        };
+        Y.lp.client.Launchpad = function() {};
+    },
+
+    tearDown: function() {
+        delete window.LP;
+    },
+
+    test_display_name_from_api: function() {
+        // The API should be consulted when the user is logged in. Set
+        // the link to "me" to something other than undefined to
+        // indicate that there is a logged-in user.
+        LP.links.me = 'not-undefined';
+        var subscriber = new APIStubSubscriber({});
+        Y.Assert.areEqual(
+            'From API', subscriber.get('display_name'),
+            'The display name should be "From API".');
+    },
+
+    test_display_name_when_not_logged_in: function() {
+        // The API should not be consulted when no user is logged in.
+        var subscriber = new APIStubSubscriber({});
+        Y.Assert.areEqual(
+            '', subscriber.get('display_name'),
+            'The display name should be the empty string.');
+    }
+}));
+
+/*
+ * Test that a Subscription is properly initialized from
+ * a simple config and that the basic methods work.
+ */
+suite.add(new Y.Test.Case({
+    name: 'Subscription Test',
+
+    setUp: function() {
+        this.config = {
+            can_be_unsubscribed: false,
+            is_direct: true,
+            is_team: true
+        };
+        this.subscription = new Y.lp.bugs.subscriber.Subscription(
+            this.config);
+    },
+
+    tearDown: function() {
+        delete this.config;
+        delete this.subscription;
+    },
+
+    test_subscription_config: function() {
+        Y.Assert.isFalse(
+            this.subscription.can_be_unsubscribed_by_user(),
+            'The user should not be able to unsubscribed this subscription.');
+        Y.Assert.isTrue(
+            this.subscription.is_team(),
+            'This subscription should be for a team.');
+        Y.Assert.isTrue(
+            this.subscription.is_direct_subscription(),
+            'This should be a direct subscription.');
+        // Also check that the defaults were set.
+        Y.Assert.isNull(
+            this.subscription.get('person'),
+            'The subscription should not be setup for a person.');
+        Y.Assert.isNull(
+            this.subscription.get('subscriber'),
+            'The subscription should not be setup for a subscriber.');
+    },
+
+    test_subscription_is_node: function() {
+        Y.Assert.isFalse(
+            this.subscription.is_node(),
+            'Initially, no node should be supplied to the config.');
+        var link = Y.one('.menu-link-subscription');
+        this.subscription.set('link', link);
+        Y.Assert.isTrue(
+            this.subscription.is_node(),
+            'This subscription should have a node for subscription link.');
+    },
+
+    test_already_subscribed: function() {
+        var person = new Y.lp.bugs.subscriber.Subscriber({uri: '/~tester'});
+        this.subscription.set('person', person);
+        Y.Assert.isTrue(
+            this.subscription.is_already_subscribed(),
+            'The JS Test User should be already subscribed.');
+    },
+
+    test_is_current_user_subscribing: function() {
+        var person = new Y.lp.bugs.subscriber.Subscriber({uri: '/~tester'});
+        this.subscription.set('person', person);
+        var subscriber = this.subscription.get('person');
+        this.subscription.set('subscriber', subscriber);
+        Y.Assert.isTrue(
+            this.subscription.is_current_user_subscribing(),
+            'Current user should be the same person being subscribed.');
+    }
+}));
+
+
+var handle_complete = function(data) {
+    window.status = '::::' + JSON.stringify(data);
+    };
+Y.Test.Runner.on('complete', handle_complete);
+Y.Test.Runner.add(suite);
+
+var console = new Y.Console({newestOnTop: false});
+console.render('#log');
+
+Y.on('domready', function() {
+    Y.Test.Runner.run();
+});
+});
+

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt	2011-06-15 09:49:37 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt	2011-06-17 07:08:54 +0000
@@ -140,6 +140,7 @@
 
 Let's use the script to fetch the ddtp-tarball upload:
 
+<<<<<<< TREE
     >>> import subprocess
     >>> import os
     >>> import sys
@@ -165,6 +166,33 @@
     ---------------------------------------------------------------------------
 								   1/1 total
     <BLANKLINE>
+=======
+  >>> import subprocess
+  >>> import os
+  >>> import sys
+  >>> from canonical.config import config
+
+  >>> script = os.path.join(
+  ...    config.root, "scripts", "ftpmaster-tools", "queue")
+
+  >>> process = subprocess.Popen([sys.executable, script, "-Q", "accepted",
+  ...                             "-s", "breezy-autotest", "fetch", "trans",
+  ...                             "-d", "ubuntutest"],
+  ...                            stdout=subprocess.PIPE)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stdout
+  Initializing connection to queue accepted
+  Running: "fetch trans"
+  Fetching ubuntutest/breezy-autotest (ACCEPTED) 1/1
+  ---------------------------------------------------------------------------
+  Constructing translations-main_20060728_all.changes
+  Constructing translations_main_20060728.tar.gz
+  ---------------------------------------------------------------------------
+                                                                 1/1 total
+  <BLANKLINE>
+>>>>>>> MERGE-SOURCE
 
 Check if the files were written:
 

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt	2011-06-15 09:49:37 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt	2011-06-17 07:08:54 +0000
@@ -93,6 +93,7 @@
 Rejecting item from accepted queue (very unlikely, normally it would
 be rejecting from unapproved or new, fix bug #54649):
 
+<<<<<<< TREE
     >>> process = subprocess.Popen([
     ...     sys.executable, script,
     ...     "-Q", "accepted",
@@ -108,11 +109,27 @@
     ...
     Rejecting dist-upgrader_20060302.0120_all.tar.gz
     ...
+=======
+  >>> process = subprocess.Popen([sys.executable, script, "-Q", "accepted",
+  ...                             "-s", "breezy-autotest", "reject", "dist",
+  ...                             "-d", "ubuntutest", "-M"],
+  ...                            stderr=subprocess.PIPE,
+  ...                            stdout=subprocess.PIPE)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stdout
+  Initializing connection to queue accepted
+  ...
+  Rejecting dist-upgrader_20060302.0120_all.tar.gz
+  ...
+>>>>>>> MERGE-SOURCE
 
 
 Accepting from rejected queue (ressurecting an reject upload is also
 very unlikely, however it's only for testing purpose, fix #54649):
 
+<<<<<<< TREE
     >>> process = subprocess.Popen([sys.executable, script, "-Q", "rejected",
     ...                             "-s", "breezy-autotest", "accept", "dist",
     ...                             "-d", "ubuntutest", "-M"],
@@ -126,10 +143,26 @@
     ...
     Accepting dist-upgrader_20060302.0120_all.tar.gz
     ...
+=======
+  >>> process = subprocess.Popen([sys.executable, script, "-Q", "rejected",
+  ...                             "-s", "breezy-autotest", "accept", "dist",
+  ...                             "-d", "ubuntutest", "-M"],
+  ...                            stderr=subprocess.PIPE,
+  ...                            stdout=subprocess.PIPE)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stdout
+  Initializing connection to queue rejected
+  ...
+  Accepting dist-upgrader_20060302.0120_all.tar.gz
+  ...
+>>>>>>> MERGE-SOURCE
 
 
 Let's use the script to fetch the dist-upgrader upload:
 
+<<<<<<< TREE
     >>> process = subprocess.Popen([sys.executable, script, "-Q", "accepted",
     ...                             "-s", "breezy-autotest", "fetch", "dist",
     ...                             "-d", "ubuntutest"],
@@ -147,6 +180,25 @@
     ---------------------------------------------------------------------------
                                                                    1/1 total
     <BLANKLINE>
+=======
+  >>> process = subprocess.Popen([sys.executable, script, "-Q", "accepted",
+  ...                             "-s", "breezy-autotest", "fetch", "dist",
+  ...                             "-d", "ubuntutest"],
+  ...                            stdout=subprocess.PIPE)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stdout
+  Initializing connection to queue accepted
+  Running: "fetch dist"
+  Fetching ubuntutest/breezy-autotest (ACCEPTED) 1/1
+  ---------------------------------------------------------------------------
+  Constructing dist-upgrader_20060302.0120_all.changes
+  Constructing dist-upgrader_20060302.0120_all.tar.gz
+  ---------------------------------------------------------------------------
+                                                                 1/1 total
+  <BLANKLINE>
+>>>>>>> MERGE-SOURCE
 
 
 Check if the files were written:

=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2011-06-15 09:49:37 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2011-06-17 07:08:54 +0000
@@ -74,6 +74,7 @@
 Having set up that infrastructure we need to prepare a breezy distroseries
 for the ubuntutest distribution.
 
+<<<<<<< TREE
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> from lp.registry.model.distribution import Distribution
     >>> from lp.soyuz.enums import PackageUploadStatus
@@ -92,6 +93,26 @@
     >>> breezy.changeslist = '[e-mail]'
     >>> fake_chroot = LibraryFileAlias.get(1)
     >>> unused = breezy['i386'].addOrUpdateChroot(fake_chroot)
+=======
+  >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
+  >>> from lp.registry.model.distribution import Distribution
+  >>> from lp.soyuz.enums import PackageUploadStatus
+  >>> from lp.soyuz.scripts.initialize_distroseries import (
+  ...     InitializeDistroSeries)
+  >>> from canonical.launchpad.database.librarian import LibraryFileAlias
+  >>> ubuntu = Distribution.byName('ubuntu')
+  >>> breezy_autotest = ubuntu['breezy-autotest']
+  >>> ubuntutest = Distribution.byName('ubuntutest')
+  >>> breezy = ubuntutest.newSeries(
+  ...     'breezy', 'Breezy Badger', 'The Breezy Badger',
+  ...     'Black and White', 'Someone', '5.10', None,
+  ...     breezy_autotest.owner)
+  >>> ids = InitializeDistroSeries(breezy, [breezy_autotest.id])
+  >>> ids.initialize()
+  >>> breezy.changeslist = '[e-mail]'
+  >>> fake_chroot = LibraryFileAlias.get(1)
+  >>> unused = breezy['i386'].addOrUpdateChroot(fake_chroot)
+>>>>>>> MERGE-SOURCE
 
 Add disk content for file inherited from ubuntu/breezy-autotest:
 
@@ -434,6 +455,7 @@
 Let's start a new package series by uploading foo_1.0-1  source in
 ubututest/breezy-RELEASE:
 
+<<<<<<< TREE
     >>> simulate_upload(
     ...     'foo_1.0-1', upload_policy='sync', is_new=True,
     ...     loglevel=logging.DEBUG)
@@ -471,6 +493,41 @@
     upload.
     ...
     Upload complete.
+=======
+  >>> simulate_upload(
+  ...     'foo_1.0-1', upload_policy='sync', is_new=True,
+  ...     loglevel=logging.DEBUG)
+  DEBUG Initializing connection.
+  ...
+  DEBUG Sent a mail:
+  DEBUG   Subject: [ubuntutest/breezy] foo 1.0-1 (New)
+  DEBUG   Sender: Root <root@localhost>
+  DEBUG   Recipients: Daniel Silverstone <[e-mail]>
+  DEBUG   Bcc: Root <root@localhost>
+  DEBUG   Body:
+  DEBUG NEW: foo_1.0.orig.tar.gz
+  DEBUG NEW: foo_1.0-1.diff.gz
+  DEBUG NEW: foo_1.0-1.dsc
+  DEBUG
+  DEBUG foo (1.0-1) breezy; urgency=low
+  DEBUG
+  DEBUG   * Initial version
+  DEBUG
+  DEBUG
+  DEBUG Your package contains new components which requires manual editing of
+  DEBUG the override file.  It is ok otherwise, so please be patient.  New
+  DEBUG packages are usually added to the overrides about once a week.
+  DEBUG
+  DEBUG You may have gotten the distroseries wrong.  If so, you may get warnings
+  DEBUG above if files already exist in other distroseries.
+  DEBUG
+  DEBUG --
+  DEBUG You are receiving this email because you are the uploader, maintainer or
+  DEBUG signer of the above package.
+  INFO  Committing the transaction and any mails associated with this upload.
+  ...
+  Upload complete.
+>>>>>>> MERGE-SOURCE
 
 And its binary:
 
@@ -496,6 +553,7 @@
 
 Upload a newer version of source package "foo" to breezy-backports:
 
+<<<<<<< TREE
     >>> simulate_upload(
     ...     'foo_2.9-1', upload_policy='sync', loglevel=logging.DEBUG)
     DEBUG Initializing connection.
@@ -503,6 +561,15 @@
     DEBUG Setting it to ACCEPTED
     ...
     Upload complete.
+=======
+  >>> simulate_upload(
+  ...     'foo_2.9-1', upload_policy='sync', loglevel=logging.DEBUG)
+  DEBUG Initializing connection.
+  ...
+  DEBUG Setting it to ACCEPTED
+  ...
+  Upload complete.
+>>>>>>> MERGE-SOURCE
 
 
 In order to verify if the binary ancestry lookup algorithm works we
@@ -537,6 +604,7 @@
 it should be rejected by the package reviewer, otherwise people can
 live with this inconsistency.
 
+<<<<<<< TREE
     >>> simulate_upload(
     ...     'foo_2.9-2', upload_policy='sync', loglevel=logging.DEBUG)
     DEBUG Initializing connection.
@@ -544,11 +612,21 @@
     DEBUG Setting it to ACCEPTED
     ...
     Upload complete.
+=======
+  >>> simulate_upload(
+  ...     'foo_2.9-2', upload_policy='sync', loglevel=logging.DEBUG)
+  DEBUG Initializing connection.
+  ...
+  DEBUG Setting it to ACCEPTED
+  ...
+  Upload complete.
+>>>>>>> MERGE-SOURCE
 
 
 Same behaviour is expected for a version in SECURITY lower than that
 in PROPOSED:
 
+<<<<<<< TREE
     >>> simulate_upload(
     ...     'foo_2.9-4', upload_policy='sync', loglevel=logging.DEBUG)
     DEBUG Initializing connection.
@@ -556,7 +634,17 @@
     DEBUG Setting it to ACCEPTED
     ...
     Upload complete.
+=======
+  >>> simulate_upload(
+  ...     'foo_2.9-4', upload_policy='sync', loglevel=logging.DEBUG)
+  DEBUG Initializing connection.
+  ...
+  DEBUG Setting it to ACCEPTED
+  ...
+  Upload complete.
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
     >>> simulate_upload(
     ...     'foo_2.9-3', upload_policy='sync', loglevel=logging.DEBUG)
     DEBUG Initializing connection.
@@ -564,6 +652,15 @@
     DEBUG Setting it to ACCEPTED
     ...
     Upload complete.
+=======
+  >>> simulate_upload(
+  ...     'foo_2.9-3', upload_policy='sync', loglevel=logging.DEBUG)
+  DEBUG Initializing connection.
+  ...
+  DEBUG Setting it to ACCEPTED
+  ...
+  Upload complete.
+>>>>>>> MERGE-SOURCE
 
 
 However, the source upload of a smaller version than the one already
@@ -710,6 +807,7 @@
     >>> fillLibrarianFile(68)
     >>> fillLibrarianFile(70)
 
+<<<<<<< TREE
     >>> run_publish_distro(careful=True)
     DEBUG   Initializing zopeless.
     DEBUG   Distribution: ubuntutest
@@ -717,6 +815,15 @@
     DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb from library
     DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-1_i386.deb from library
     ...
+=======
+  >>> run_publish_distro(careful=True)
+  DEBUG   Initializing zopeless.
+  DEBUG   Distribution: ubuntutest
+  ...
+  DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb from library
+  DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-1_i386.deb from library
+  ...
+>>>>>>> MERGE-SOURCE
 
 
 Delete the uncompressed Packages and Sources files from the archive folder.
@@ -739,6 +846,7 @@
 Check that breezy-autotest is skipped, to ensure that changes to what's
 uploaded in the test above don't break the assumptions of this test.
 
+<<<<<<< TREE
     >>> run_publish_distro(careful_publishing=True)
     DEBUG   Initializing zopeless.
     DEBUG   Distribution: ubuntutest
@@ -749,6 +857,18 @@
     ...
     DEBUG   Skipping release files for breezy-autotest/RELEASE
     ...
+=======
+  >>> run_publish_distro(careful_publishing=True)
+  DEBUG   Initializing zopeless.
+  DEBUG   Distribution: ubuntutest
+  ...
+  DEBUG   /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb is already in pool with the same content.
+  ...
+  DEBUG   Skipping a-f stanza for breezy-autotest/RELEASE
+  ...
+  DEBUG   Skipping release files for breezy-autotest/RELEASE
+  ...
+>>>>>>> MERGE-SOURCE
 
 Check the breezy-security release file doesn't exhibit bug 54039.
 

=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
--- lib/lp/soyuz/doc/soyuz-upload.txt	2011-06-15 09:49:37 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt	2011-06-17 07:08:54 +0000
@@ -556,6 +556,7 @@
 
 Invoke Publisher script against the 'ubuntutest' distribution:
 
+<<<<<<< TREE
     >>> script = os.path.join(config.root, "scripts", "publish-distro.py")
     >>> process = subprocess.Popen([sys.executable, script, "-vvCq",
     ...                             "-d", "ubuntutest"],
@@ -572,6 +573,24 @@
     DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz from library
     DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc from library
     ...
+=======
+  >>> script = os.path.join(config.root, "scripts", "publish-distro.py")
+  >>> process = subprocess.Popen([sys.executable, script, "-vvCq",
+  ...                             "-d", "ubuntutest"],
+  ...                            stdout=subprocess.PIPE,
+  ...                            stderr=subprocess.PIPE)
+  >>> stdout, stderr = process.communicate()
+  >>> print stdout
+  <BLANKLINE>
+  >>> print stderr
+  DEBUG   Initializing zopeless.
+  DEBUG     Distribution: ubuntutest
+  ...
+  DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz from library
+  DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz from library
+  DEBUG   Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc from library
+  ...
+>>>>>>> MERGE-SOURCE
 
 
 # XXX cprov 2006-04-12 bug=3989
@@ -662,6 +681,7 @@
 already marked as published in the database and, if the files are
 already on disk, verify the contents are as expected.
 
+<<<<<<< TREE
     >>> print stderr
     DEBUG   Initializing zopeless.
     DEBUG     Distribution: ubuntutest
@@ -670,6 +690,16 @@
     DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz is already in pool with the same content.
     DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc is already in pool with the same content.
     ...
+=======
+  >>> print stderr
+  DEBUG   Initializing zopeless.
+  DEBUG     Distribution: ubuntutest
+  ...
+  DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz is already in pool with the same content.
+  DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.diff.gz is already in pool with the same content.
+  DEBUG   /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08-1.dsc is already in pool with the same content.
+  ...
+>>>>>>> MERGE-SOURCE
 
 Invalidates SQLObject cache to cope with publisher.
 
@@ -743,6 +773,7 @@
 
 Defining path to the script:
 
+<<<<<<< TREE
     >>> script = os.path.join(config.root, "scripts", "ftpmaster-tools",
     ...                       "archive-cruft-check.py")
     >>> process = subprocess.Popen([sys.executable, script, "-vn",
@@ -766,6 +797,31 @@
     DEBUG   Building all superseded by any list (ASBA):
     DEBUG   No NBS found
     <BLANKLINE>
+=======
+  >>> script = os.path.join(config.root, "scripts", "ftpmaster-tools",
+  ...                       "archive-cruft-check.py")
+  >>> process = subprocess.Popen([sys.executable, script, "-vn",
+  ...                             "-d", "ubuntutest",
+  ...                             "-s", "breezy-autotest",
+  ...                             "/var/tmp/archive"],
+  ...                            stdout=subprocess.PIPE,
+  ...                            stderr=subprocess.PIPE,)
+  >>> stdout, stderr = process.communicate()
+  >>> process.returncode
+  0
+  >>> print stderr
+  DEBUG   Acquiring lock
+  DEBUG   Initializing connection.
+  DEBUG   Considering Sources:
+  DEBUG   Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/restricted/source/Sources.gz
+  DEBUG   Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/main/source/Sources.gz
+  DEBUG   Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/multiverse/source/Sources.gz
+  DEBUG   Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/universe/source/Sources.gz
+  DEBUG   Building not build from source list (NBS):
+  DEBUG   Building all superseded by any list (ASBA):
+  DEBUG   No NBS found
+  <BLANKLINE>
+>>>>>>> MERGE-SOURCE
 
 
 Nice! That's enough for now.. let's kill the process and clean

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2011-06-16 11:31:24 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2011-06-17 07:08:54 +0000
@@ -470,6 +470,14 @@
             "BinaryPackageBuild.source_package_release = %s" % (
             sqlvalues(archive.id, distroarchseries.architecturetag, self))]
 
+<<<<<<< TREE
+=======
+        # XXX bigjools 2011-05-04 bug=777234
+        # We'll need exceptions in here for when we start initializing
+        # derived distros without rebuilding binaries.  The matched
+        # archives will need to traverse the DistroSeriesParent tree.
+
+>>>>>>> MERGE-SOURCE
         # Query only the last build record for this sourcerelease
         # across all possible locations.
         query = " AND ".join(queries)

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2011-06-16 20:26:48 +0000
+++ lib/lp/testing/__init__.py	2011-06-17 07:08:54 +0000
@@ -74,8 +74,20 @@
 import time
 import unittest
 
-import simplejson
-
+<<<<<<< TREE
+import simplejson
+
+=======
+import simplejson
+
+try:
+    import html5browser
+    # Hush lint.
+    html5browser
+except ImportError:
+    html5browser = None
+
+>>>>>>> MERGE-SOURCE
 from bzrlib import trace
 from bzrlib.bzrdir import (
     BzrDir,
@@ -938,6 +950,7 @@
 
     def setUp(self):
         super(YUIUnitTestCase, self).setUp()
+<<<<<<< TREE
         # html5browser imports from the gir/pygtk stack which causes
         # twisted tests to break because of gtk's initialize.
         try:
@@ -962,6 +975,24 @@
             # Did not get a report back.
             self._yui_results = self.MISSING_REPORT
             return
+=======
+        client = html5browser.Browser()
+        html_uri = 'file://%s' % os.path.join(
+            config.root, 'lib', self.test_path)
+        page = client.load_page(html_uri, timeout=self.js_timeout)
+        if page.return_code == page.CODE_FAIL:
+            self._yui_results = self.TIMEOUT
+            return
+        # Data['type'] is complete (an event).
+        # Data['results'] is a dict (type=report)
+        # with 1 or more dicts (type=testcase)
+        # with 1 for more dicts (type=test).
+        report = simplejson.loads(page.content)
+        if report.get('type', None) != 'complete':
+            # Did not get a report back.
+            self._yui_results = self.MISSING_REPORT
+            return
+>>>>>>> MERGE-SOURCE
         self._yui_results = {}
         for key, value in report['results'].items():
             if isinstance(value, dict) and value['type'] == 'testcase':