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
F14970415: D20871.id49756.diff
Sun, Feb 16, 11:26 AM
Unknown Object (File)
Sun, Feb 9, 8:19 AM
Unknown Object (File)
Sun, Feb 9, 8:19 AM
Unknown Object (File)
Sun, Feb 9, 8:19 AM
Unknown Object (File)
Sun, Feb 9, 8:19 AM
Unknown Object (File)
Wed, Feb 5, 11:34 PM
Unknown Object (File)
Wed, Jan 29, 10:25 AM
Unknown Object (File)
Sat, Jan 25, 6:00 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.