Giter Site home page Giter Site logo

Comments (7)

benjamb avatar benjamb commented on June 19, 2024

I'd quite like to submit a patch that does something along the lines of:

try:
    push_rebased_and_rewritten_version()
finally:
    apply_approvals()

but I'm unsure as to whether or not that would be appropriate.

from marge-bot.

aschmolck avatar aschmolck commented on June 19, 2024

Right now I can't see why resetting approvals immediately after push wouldn't be OK -- @jcpetruzza? If so I'm happy to move the steps around.

Not sure about the try/finally: if the push went through, the approvals shouldn't have been reset to start with; the case where the push in fact succeeded but there was an exception before confirmation is received seems like it /should/ be exceedingly rare (in which case manually re-approving seems fine). Does this happen to you more often?

from marge-bot.

benjamb avatar benjamb commented on June 19, 2024

I have a limited understanding of the code base. However, is it not the act of force pushing that is resetting approvals (it is in our case at least), therefore a successful push does not imply approvals haven't been reset.

WRT the use of try/finally: I agree it seems unnecessary, though I've since forgotten why I suggested that :)

from marge-bot.

aschmolck avatar aschmolck commented on June 19, 2024

The approvals are reset on any push, assuming you have configured gitlab to do so (it's optional, but generally useful). Unfortunately gitlab is a bit dumb about resetting approvals and re-running CI: it should probably not do the former and defnitely not the latter if all that changed where merge commit comments.

I'll probably push a fix later this evening (along the lines above).

from marge-bot.

benjamb avatar benjamb commented on June 19, 2024

@aschmolck I assume that MR was supposed to close #56?

from marge-bot.

aschmolck avatar aschmolck commented on June 19, 2024

@benjamb Indeed :|

from marge-bot.

benjamb avatar benjamb commented on June 19, 2024

@aschmolck Thanks!

from marge-bot.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.