Provide more information about merge progress in "arc land" under Git
ClosedPublic
Actions

Authored by epriestley on Jun 5 2020, 11:08 PM.

Tags

None

Referenced Files

	F19511293: D21318.diff
	Mon, Jan 12, 12:34 AM

	F18978223: D21318.diff
	Nov 16 2025, 7:30 PM

	F18920773: D21318.id.diff
	Nov 9 2025, 1:20 PM

	F18906933: D21318.diff
	Nov 8 2025, 9:20 PM

	F18807727: D21318.id.diff
	Oct 19 2025, 3:14 AM

	F18782789: D21318.id50785.diff
	Oct 13 2025, 2:36 AM

	F18765139: D21318.id50746.diff
	Oct 7 2025, 9:45 AM

	F18658467: D21318.diff
	Sep 23 2025, 6:39 AM

View All Files

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T13546: Modernize the "arc land" workflow
Commits: rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git

Summary

Ref T13546. Communicate more progress information and provide additional details when merge conflicts occur.

Test Plan

Hit a merge conflict, saw more helpful output.

Diff Detail

Repository

rARC Arcanist

Branch

land15

Lint

Lint Passed

Severity	Location	Code	Message
Advice	src/land/engine/ArcanistGitLandEngine.php:291	XHP16	TODO Comment

Unit

Tests Passed

Build Status

Buildable 24568
Build 33865: Run Core Tests
Build 33864: arc lint + arc unit

Event Timeline

epriestley created this revision.Jun 5 2020, 11:08 PM

Harbormaster completed remote builds in B24568: Diff 50746.Jun 5 2020, 11:09 PM

epriestley requested review of this revision.Jun 5 2020, 11:09 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jun 8 2020, 11:20 PM

Closed by commit rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rARC94f78cf87c78: Provide more information about merge progress in "arc land" under Git.

Revision Contents
Changeset List

Path

Size

src/

land/

engine/

ArcanistGitLandEngine.php

52 lines

Diff 50746

View Options

src/land/engine/ArcanistGitLandEngine.php

Provide more information about merge progress in "arc land" under GitClosedPublicActions