On Thu, Jul 18, 2024 at 01:41:48PM +0100, Robie Basak wrote:
> In this case it looks like you added the changelog entry, so the commit
> supplied in the changes file did not match the upload you performed. In
> this case, for integrity reasons the git-ubuntu importer will reject the
> supplied commit and synthesize its own to ensure that the final commit
> matches the upload.
Ah, thank you. For some reason I thought that the changelog changes will
be added as a follow-up commit or as part of the merge commit.
> One way to handle this case (before upload is to make your own fixup
> commits, push these to your own namespace, and then supply your own
> commit in the changes file.
>
> Once you have your fixup commits ready, `git ubuntu prepare-upload args`
> can arrange this for you. See:
>
> https://canonical-git-ubuntu.readthedocs-hosted.com/en/latest/howto/upload.html
Okay, I will use this approach next time.
> I'll mark that particular MP as Merged manually for you. Thank you for
> sponsoring!
Thank you!
--
Dmitry Shachnev
--
ubuntu-devel mailing list
ubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
