Arcanist - stop arc land if local is ahead of remote
ClosedPublic
Actions

Authored by btrahan on Apr 9 2014, 7:30 PM.

Tags

None

Referenced Files

	Unknown Object (File)
	Mon, Apr 15, 3:39 AM

	Unknown Object (File)
	Mon, Apr 15, 3:38 AM

	Unknown Object (File)
	Mon, Apr 15, 3:20 AM

	Unknown Object (File)
	Mon, Apr 15, 3:02 AM

	Unknown Object (File)
	Feb 18 2024, 3:27 AM

	Unknown Object (File)
	Feb 15 2024, 5:59 PM

	Unknown Object (File)
	Feb 15 2024, 5:59 PM

	Unknown Object (File)
	Feb 15 2024, 3:01 PM

View All Files

Subscribers

epriestley

Korvin

Tokens

"Like" token, awarded by chad.

Details

Reviewers

epriestley

Maniphest Tasks

T4291: arc land does not stop when local is ahead of remote when using git

Commits

rARC02456c0aed60: Arcanist - stop arc land if local is ahead of remote

Summary

Fixes T4291. Also pht user-facing strings.

Test Plan

made a branch foo off master. made a commit and a diff in foo. switched backed to master and cowboy committed some thing. went back to branch`foo`, did an arc land, and saw the error message. went back to master, did a git resert --hard HEAD^1, went back to branch foo, and then successfully arc landed.

also ran arc help land and things looked good