I suggest you ...

trigger on merge

In order to be able to implement a condition on merge, such as requiring a peer review before merge, or a test build completing, I would like to see the ability to have a trigger on a merge operation. Today we can trigger on the check-in after starting a merge, but then if the condition is not met we are left with having to undo the merge (remove the pending changes). It would be much easier to implement this sort of "merge gate condition" if the trigger could be on the actual merge operation.

6 votes
Vote
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    I agree to the terms of service
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    Todd Alden shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    2 comments

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      I agree to the terms of service
      Signed in as (Sign out)
      Submitting...
      • AdminCodice Software (Admin, plasticscm) commented  ·   ·  Flag as inappropriate

        Hi Todd,

        Questions:

        * When you mean "on merge" I guess you mean a *server* trigger that runs before-merge, because the "after-merge" is already the checkin.

        * There's no easy way to do an after-merge other than the checkin, because you don't know for sure if the merge was done, on the server side, in any other operation.

        * The other problem with this is that the trigger should be run anytime you try to merge. I mean, on CLI you have the cm merge, but you can run it with or without the --merge flag. The trigger will need to be run on both, even if one is just a "test" to figure out what needs to be merged (like happens on the GUI,you open up the merge but you're not forced to really run it).

        I say all these because the merge operation is not only a server-side operation, but most of it happens on the client, and as such the server doesn't know where to pull the trigger :-)

        Because I guess a client-side trigger won't do the job, right? You need something central to enforce the op, correct?

        Thanks!

      Feedback and Knowledge Base