Differential D20871

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

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

Tags

None

Referenced Files

	F18818846: D20871.diff
	Wed, Oct 22, 2:40 AM

	F18750064: D20871.id49756.diff
	Sat, Oct 4, 6:21 AM

	F18734088: D20871.id.diff
	Tue, Sep 30, 10:48 PM

	F18697862: D20871.diff
	Sat, Sep 27, 10:31 AM

	F18653618: D20871.diff
	Sep 21 2025, 2:38 PM

	F18570993: D20871.id49756.diff
	Sep 10 2025, 4:16 AM

	F18570990: D20871.id49755.diff
	Sep 10 2025, 4:16 AM

	F18567489: D20871.id.diff
	Sep 9 2025, 3:50 PM

View All Files

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T13434: Support Perforce/Git in "arc land"
Commits: rARC73943d1bc9d3: Make "arc land --merge" an explicit error when targeting a Perforce remote

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.