Page MenuHomePhabricator

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

Authored by epriestley on Oct 28 2019, 6:52 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 21, 10:10 AM
Unknown Object (File)
Mon, Mar 4, 3:22 PM
Unknown Object (File)
Jan 27 2024, 7:41 AM
Unknown Object (File)
Dec 16 2023, 6:33 AM
Unknown Object (File)
Dec 11 2023, 3:46 PM
Unknown Object (File)
Nov 30 2023, 4:16 AM
Unknown Object (File)
Nov 17 2023, 2:45 AM
Unknown Object (File)
Oct 30 2023, 3:05 PM
Subscribers
None

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

Event Timeline

This revision was not accepted when it landed; it landed in state Needs Review.Oct 28 2019, 6:59 PM
This revision was automatically updated to reflect the committed changes.