Page MenuHomePhabricator

Add a check for ambiguous merge strategies after the "history.immutable" behavioral change
ClosedPublic

Authored by epriestley on Jun 8 2020, 1:40 PM.

Details

Summary

Ref T13546. When users hit a situation where we would select "squash" but would previously select "merge", prevent them from continuing under ambiguous conditions.

Test Plan

Ran "arc land" in Git with "history.immutable" true, false, and not configured.

Diff Detail

Repository
rARC Arcanist
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Jun 8 2020, 1:40 PM
epriestley requested review of this revision.Jun 8 2020, 1:40 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:26 PM
This revision was automatically updated to reflect the committed changes.