Comment 6 for bug 1649832

Revision history for this message
Nish Aravamudan (nacc) wrote :

Relevant publishes:

Importing 2.13~rc3-2ubuntu2 to ubuntu/gutsy
Importing 2.13~rc3-5 to ubuntu/gutsy
01/05/2017 10:31:33 - ERROR:Unable to import patches-applied 2.13~rc3-5
Importing 2.13-3ubuntu1 to ubuntu/gutsy

With some fixes applied onto the previous diff, here's how the applied branch looks:

commit 9d1a7ce049feb2ff62e782ec02556c8999b36261 (tag: lpusip/applied/2.13-3ubunt
u1, lpusip/applied/ubuntu/gutsy)
Merge: de659b6 910da7e
Author: LaMont Jones <email address hidden>
Date: Thu Sep 6 14:38:14 2007 -0600

Where the parents are:

    Publish parent: de659b6722d7c06097b3fa20f648f92e8401c657
    Unapplied parent: 910da7ea18fd62a43fa723aad744c81fa687c1c2

commit de659b6722d7c06097b3fa20f648f92e8401c657 (tag: lpusip/applied/orphan/2.13
_rc3-5)

commit 910da7ea18fd62a43fa723aad744c81fa687c1c2 (tag: lpusip/import/2.13-3ubuntu1, lpusip/ubuntu/gutsy)

I think this is actually incorrect, though? Do we want three top-level namespaces in lpusip?

lpusip/applied
lpusip/import
lpusip/orphan/applied
lpusip/orphan/import

Or do we want two top-level namespaces:

lpusip/applied
lpusip/applied/orphan
lpusip/import
lpusip/import/orphan

?

And for unapplied, it's ok to use an orphaned commit as a parent, but for applied it's not, as the applied orphan may be an orphan for the reason that it does not correspond to the upload at all?