Wednesday 3 November 2021

Re: git-ubuntu rich history beta

On Wednesday, October 13 2021, Robie Basak wrote:

> git-ubuntu is now able to accept rich history directly from any uploader.
>
> The CLI is in beta and subject to change. Feedback appreciated!
[...]
> # Caveats
>
> * Note that error paths are not currently well handled. I intend to fix
> these before a final release. I'd appreciate feedback on what edge
> cases you hit, so I can make sure I handle those.

Thanks for working on this.

As I've mentioned during our meeting earlier today, I'm not sure the
folowing can be characterized as a problem or not, but it's something
that I think is worth considering.

I noticed that prepare-for-upload doesn't force-push a branch. In most
cases this is fine because you will use the command only when preparing
the final upload, which will hopefully be accepted and then there's
nothing else you need to do. However, in specific scenarios this
limitation gets in the way a little bit.

For example, when you prepare an SRU upload but the SRU team requests a
few changes to the package before accepting it. For me, this involves
going back to the branch you're developing the SRU fix on, rewriting its
history, and then preparing the upload again. I remember doing this at
least on two occasions, and then invoking prepare-for-upload would lead
to an error because it wouldn't force-push the changes to the repo.

The error displayed comes from git, so it's simple to understand and
fix: I just had to manually run "git push pkg branchname --force".
However, it would have been nice to have git-ubuntu do that for me.
Maybe, as you mentioned, we could have a "--force-push" option that can
be passed to prepare-for-upload (I think only "--force" is too simple
and maybe ambiguous here).

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

--
ubuntu-devel mailing list
ubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel