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
F14079785: D20871.diff
Fri, Nov 22, 9:50 AM
Unknown Object (File)
Tue, Nov 19, 3:36 AM
Unknown Object (File)
Sun, Nov 3, 6:07 PM
Unknown Object (File)
Oct 21 2024, 11:13 AM
Unknown Object (File)
Oct 18 2024, 7:26 PM
Unknown Object (File)
Oct 16 2024, 7:15 AM
Unknown Object (File)
Oct 3 2024, 6:13 AM
Unknown Object (File)
Sep 30 2024, 5:08 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.