git-ubuntu merge proposal

Following a merge and testing, submit a merge proposal to include the updated package in the Archive.

Merging series

The article series provides guidance on performing package merges.

Process overview:
How to do a merge:

  1. Preliminary steps

  2. Merge process

  3. Fix the changelog

  4. Upload a PPA

  5. Test the new build

  6. git-ubuntu merge proposal (this article)

Extra:

Open a merge proposal

See Open the merge proposal in How to submit a merge proposal for the full instructions. For merges, use --target-branch debian/sid:

$ git ubuntu submit --reviewer $REVIEWER --target-branch debian/sid
Your merge proposal is now available at: https://code.launchpad.net/~kstenerud/ubuntu/+source/at/+git/at/+merge/358655
If it looks OK, please move it to the 'Needs Review' state.

Note

It is important to target debian/sid, not ubuntu/devel when submitting a merge proposal. Using a target branch of debian/sid may seem wrong, but is a workaround for LP: #1976112.

Note

Git branches with % in their name don’t work. Use something like _.

Set --reviewer to the team (or user) on Launchpad that should look at your change – by default it is --reviewer ubuntu-sponsors.

  • If you do not have upload rights for this package, use ubuntu-sponsors here. That adds your Merge Proposal to the Ubuntu sponsoring queue, so people with upload rights for that package may eventually review it for you.

  • To notify a specific team, use, e.g. canonical-foundations, canonical-public-cloud, or ubuntu-server.

To avoid having to specify the --reviewer flag, configure the reviewers for git-ubuntu. Include a section like the following either globally in ~/.gitconfig, or in individual repositories in .git/config:

[gitubuntu.submit]
    defaultReviewer = <your-ubuntu-teamname>, \
                      <canonical-more-reviewers>, \
                      <canonical-otherteam>

The equivalent git config command is:

$ git config [--global] gitubuntu.submit.defaultReviewer <launchpad-reviewer>

If this fails, do it manually.

Update the merge proposal

See Prepare a description and Open the merge proposal in How to submit a merge proposal for guidance on writing the description and linking your PPA.

When adding a comment to help the reviewer, include:

  • a link to the PPA

  • test steps and results

Example:

PPA: https://launchpad.net/~kstenerud/+archive/ubuntu/disco-at-merge-1802914

Basic test:
$ echo "echo abc >test.txt" | at now + 1 minute && sleep 1m && cat test.txt && rm test.txt

Package tests:
This package contains no tests.

Open the review

Change the MP status from work in progress to needs review.

For sponsorship options, see Get sponsorship in How to submit a merge proposal.

Follow the migration

See Follow the migration in How to submit a merge proposal.