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
F22743423: D20871.id.diff
Sun, Oct 4, 3:32 PM
F22603641: D20871.id49756.diff
Mon, Sep 28, 8:39 PM
F22561828: D20871.diff
Thu, Sep 24, 9:10 AM
Unknown Object (File)
Aug 26 2026, 11:32 AM
Unknown Object (File)
Jul 8 2026, 2:14 AM
Unknown Object (File)
Jul 6 2026, 4:15 PM
Unknown Object (File)
Jul 5 2026, 1:16 PM
Unknown Object (File)
Jul 4 2026, 8:09 AM
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.