Code review comment for ~bryce/ubuntu/+source/apache2:merge-v2.4.48-3.1-impish

Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks Christian,

In addition to the usual upload steps, for apache2 I also ran the workaround command to ensure inclusion of empty dirs. It rebases the tree, and I found it hit a few merge conflicts that I had to fixup manually.

stirling:~/pkg/Apache2/merge-v2.4.48-3.1/apache2-gu$ python3 ../emptydirfixup.py fix-many base
<conflicts...rebase...allow-empty...continue>
<conflicts...rebase...allow-empty...continue>
New HEAD is 1bc85146f2416ee12cbc52371bfbb038522d5d2e
Successfully rebased and updated refs/heads/merge-v2.4.48-3.1-impish.
stirling:~/pkg/Apache2/merge-v2.4.48-3.1/apache2-gu$ git ubuntu tag --upload
stirling:~/pkg/Apache2/merge-v2.4.48-3.1/apache2-gu$ git push pkg upload/2.4.48-3.1ubuntu1
Enumerating objects: 23, done.
Counting objects: 100% (23/23), done.
Delta compression using up to 12 threads
Compressing objects: 100% (12/12), done.
Writing objects: 100% (16/16), 1.65 KiB | 240.00 KiB/s, done.
Total 16 (delta 11), reused 4 (delta 2)
To ssh://git.launchpad.net/ubuntu/+source/apache2
 * [new tag] upload/2.4.48-3.1ubuntu1 -> upload/2.4.48-3.1ubuntu1
$ dput ubuntu ../apache2_2.4.48-3.1ubuntu1_source.changes
Checking signature on .changes
gpg: ../apache2_2.4.48-3.1ubuntu1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../apache2_2.4.48-3.1ubuntu1.dsc: Valid signature from E603B2578FB8F0FB
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.48-3.1ubuntu1.dsc: done.
  Uploading apache2_2.4.48.orig.tar.gz: done.
  Uploading apache2_2.4.48-3.1ubuntu1.debian.tar.xz: done.
  Uploading apache2_2.4.48-3.1ubuntu1_source.buildinfo: done.
  Uploading apache2_2.4.48-3.1ubuntu1_source.changes: done.
Successfully uploaded packages.

« Back to merge proposal