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

	F19527276: D20871.diff
	Mon, Jan 19, 12:08 AM

	F19527194: D20871.diff
	Sun, Jan 18, 11:35 PM

	F19515608: D20871.diff
	Wed, Jan 14, 1:47 PM

	F19509635: D20871.diff
	Sat, Jan 10, 11:14 PM

	F19083114: D20871.id49756.diff
	Dec 2 2025, 12:30 PM

	F18985261: D20871.id49755.diff
	Nov 17 2025, 12:57 PM

	F18908917: D20871.id49755.diff
	Nov 9 2025, 1:34 AM

	F18906213: D20871.id49756.diff
	Nov 8 2025, 5:28 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.