Skip to content

operations: Drop code supporting UserMergeToRef's precursory ref update

Patrick Steinhardt requested to merge pks-user-merge-to-ref-drop-precursor-ff into master

Previous to commit 907c03bf (operations: Skip precursory update of target ref in UserMergeToRef, 2021-06-09), UserMergeToRef used to always create the target reference even if the merge failed. This behaviour was unexpected and caused issues for transactions because we have a vote before an expected failure, which would as a result cause replication jobs to be created if the merge fails.

This code was replaced by code which simply asserts that the target reference didn't change while we were computing the merge commit. The old code continued to exist behind a feature flag though in case this semantic change were to cause issues.

No issues have been observed, so let's remove the feature flag.

Merge request reports