Page MenuHomePhabricator

Make "arc land --merge" an explicit error when targeting a Perforce remote
ClosedPublic

Authored by epriestley on Mon, Oct 28, 6:52 PM.

Details

Summary

Ref T13434. Since "git p4 submit" gets more complicated when submitting merges, and empty merges (as with "--no-ff") seem to vanish, and it's not clear this is desirable or useful anyway, just make the "merge" strategy an explicit error with Perforce remotes.

Test Plan

Ran "arc land --merge ..." in a Git/Perforce repository, got an explicit error. Ran "arc land --squash ...", got existing working behavior.

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.Mon, Oct 28, 6:52 PM
epriestley requested review of this revision.Mon, Oct 28, 6:52 PM
This revision was not accepted when it landed; it landed in state Needs Review.Mon, Oct 28, 6:59 PM
This revision was automatically updated to reflect the committed changes.