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.
Tags
None
Referenced Files
F15442883: D21332.id50795.diff
Thu, Mar 27, 1:05 AM
F15441544: D21332.id50762.diff
Wed, Mar 26, 6:44 PM
F15437005: D21332.id.diff
Tue, Mar 25, 5:00 PM
F15432105: D21332.diff
Mon, Mar 24, 4:08 PM
F15421449: D21332.id.diff
Fri, Mar 21, 11:55 PM
F15392220: D21332.id50795.diff
Sat, Mar 15, 1:52 PM
F15331979: D21332.diff
Fri, Mar 7, 3:42 PM
Unknown Object (File)
Mar 3 2025, 3:44 AM
Subscribers
None

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
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

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.