Fast-forward merge leads to deployment of an outdated revision

My issue is similar to the one described in https://devnet.jetbrains.com/message/5530878#5530878

I have a deploy configuration with snapshot and artifact dependencies on a build configuration.

Lets say following events happen:
1. master branch build followed by master deployment
3. feature branch created from master, commits added, followed by build and deploy of the feature branch
3. feature branch fast-forward merged into master branch (TC does not see this as a change on master - https://youtrack.jetbrains.com/issue/TW-22485)
4. someone clicks "run" and triggers master deployment. the previous master (from step 1) is deployed instead of the current one (from step 3).

This is extremely misleading. Is there any way to work around this behavior or change it? My only reasonable idea is to add to "deploy" configuration a step checking if the revision being deployed is the most recent one and failing the build otherwise.

Thanks

Please sign in to leave a comment.