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.
Details
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
Ran "arc land --merge ..." in a Git/Perforce repository, got an explicit error. Ran "arc land --squash ...", got existing working behavior.
Diff Detail
Diff Detail
- Repository
- rARC Arcanist
- Branch
- perforce5
- Lint
Lint Passed - Unit
Tests Passed - Build Status
Buildable 23584 Build 32415: Run Core Tests Build 32414: arc lint + arc unit