Code review comment for ~bryce/ubuntu/+source/python-seamicroclient:python-seamicroclient-merge-v0.4.0-3-eoan

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks!

I suggest to squash together these two commits:

commit f42c873f5b3bba01382e0972e6b9893177cfa8c3
Author: Bryce Harrington <email address hidden>
Date: Mon Aug 5 19:18:02 2019 -0700

      * d/p/add-pkg-info.patch: Update Version for PKG-INFO and add DEP3

commit 29516cda51d422cac8df3894c22eb59e1be43661
Author: Bryce Harrington <email address hidden>
Date: Thu Aug 1 14:41:33 2019 -0700

        - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version

And just add a note saying you updated DEP3 and the version. Perhaps like this:
- d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
  [Updated version and DEP3 header]

The same would then appear in the changelog like this:
  * Merge with Debian unstable. Remaining changes:
    - d/control: Drop Build-Depends on python-hacking since we don't use pep8 testing.
    - d/p/add-pkg-info.patch: Add PKG-INFO in top level dir to set egg version
      [Updated version and DEP3 header]

If you prefer it like it is, then this squashing can happen in the next merge, when creating the logical tag. It just looks a bit odd to have the same patch mentioned twice.

« Back to merge proposal