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)
	Tue, Dec 17, 6:39 AM

	Unknown Object (File)
	Fri, Dec 13, 5:48 PM

	Unknown Object (File)
	Sat, Nov 30, 2:06 AM

	Unknown Object (File)
	Nov 22 2024, 10:45 PM

	Unknown Object (File)
	Oct 17 2024, 11:21 AM

	Unknown Object (File)
	Sep 7 2024, 11:30 PM

	Unknown Object (File)
	Aug 30 2024, 8:41 PM

	Unknown Object (File)
	Jul 28 2024, 1:11 AM

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