Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QgsBinaryWidgetWrapper: fix focus-related crash #36722

Merged
merged 2 commits into from
May 26, 2020
Merged

Conversation

rouault
Copy link
Contributor

@rouault rouault commented May 26, 2020

Fixes #30210

@rouault rouault added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport release-3_10 labels May 26, 2020
Copy link
Collaborator

@nyalldawson nyalldawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new class could be used for the resource widget too, right?

@rouault
Copy link
Contributor Author

rouault commented May 26, 2020

This new class could be used for the resource widget too, right?

probably. Didn't want to go too far before checking if this approach was acceptable.

@rouault
Copy link
Contributor Author

rouault commented May 26, 2020

This new class could be used for the resource widget too, right?

PR implementing this in #36734

@rouault
Copy link
Contributor Author

rouault commented May 26, 2020

Question w.r.t backport bot: as this PR is made of several commits, which merge option should I use ?

@nyalldawson
Copy link
Collaborator

It doesn't really matter - I've started manually collecting backports in #36718 , where they wait until the next LTR release before merge. This way they get a full month in a stable release to avoid regressions in the LTR patch releases.

I personally prefer a linear git history with no merges, but @m-kuhn will fight me on that!

@rouault
Copy link
Contributor Author

rouault commented May 26, 2020

I've started manually collecting backports in #36718 , where they wait until the next LTR release before merge

hum, is this is a new general policy ? Should I still tag this PR with "backport release-3_10" ? Or if I do it, then the backport PR shouldn't be merged right away ?

@nyalldawson
Copy link
Collaborator

It's an informal policy @m-kuhn and I developed. I need to file a QEP and get it formally accepted.

The rough process is:

  • make a backport pr (via the bot or not)
  • tag it as "not for merge" and let the CI run over it
  • when accepted, i'll either pick it up and move it to the general pending PR (to keep the queue clean), or just leave it in the "not for merge" state until the next LTR patch release occurs, at which stage all the pending ones will be merged

@rouault rouault merged commit bcea438 into qgis:master May 26, 2020
@rouault
Copy link
Contributor Author

rouault commented May 26, 2020

It's an informal policy @m-kuhn and I developed

ok, got it

@m-kuhn
Copy link
Member

m-kuhn commented May 26, 2020

Technically it should be totally doable to create a fully working backport bot (a modernized version of the original one - the one we have grown to like so much - as github action), including cross-repository pull request support.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

QGIS crashes when adding file to geopackage -> layer -> field(BLOB)
3 participants