Page MenuHomePhabricator
Differential D14343

Make "Land Revision" show merge conflicts more clearly
ClosedPublic
Actions

Authored by epriestley on Oct 26 2015, 6:23 PM.
Tags
None
Referenced Files
F18935816: D14343.id34628.diff
Nov 10 2025, 7:01 PM
F18814512: D14343.diff
Oct 20 2025, 11:24 PM
F18813355: D14343.id34627.diff
Oct 20 2025, 3:36 PM
F18784631: D14343.diff
Oct 13 2025, 1:44 PM
F18695105: D14343.id.diff
Sep 27 2025, 5:04 AM
F18645627: D14343.id34613.diff
Sep 19 2025, 8:16 AM
F18616734: D14343.diff
Sep 14 2025, 6:48 PM
F18599535: D14343.id.diff
Sep 13 2025, 7:38 AM
View All Files
Subscribers
None

Details

Reviewers
chad
Maniphest Tasks
T182: Commit into repository directly from differential
Commits
Restricted Diffusion Commit
rP0b24a6e2006e: Make "Land Revision" show merge conflicts more clearly
Summary

Ref T182. We just show "an error happened" right now. Improve this behavior.

This error handling chain is a bit ad-hoc for now but we can formalize it as we hit other cases.

Test Plan

Screen Shot 2015-10-26 at 11.08.05 AM.png (548×1 px, 106 KB)

Screen Shot 2015-10-26 at 11.08.06 AM.png (548×1 px, 89 KB)

Diff Detail

Repository
rP Phabricator
Branch
workmerge4
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 8436
Build 9698: Run Core Tests
Build 9697: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 34613.Oct 26 2015, 6:23 PM
epriestley retitled this revision from to Make "Land Revision" show merge conflicts more clearly.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
epriestley added a task: T182: Commit into repository directly from differential.
chad accepted this revision.Oct 26 2015, 7:10 PM
chad edited edge metadata.
This revision is now accepted and ready to land.Oct 26 2015, 7:10 PM
epriestley updated this revision to Diff 34627.Oct 26 2015, 8:09 PM
epriestley edited edge metadata.
  • Rebase.
Closed by commit rP0b24a6e2006e: Make "Land Revision" show merge conflicts more clearly (authored by epriestley, committed by epriestley). · Explain WhyOct 26 2015, 8:11 PM
This revision was automatically updated to reflect the committed changes.
joshuaspence mentioned this in T9642: Unable to download images on Android.Oct 27 2015, 12:48 PM

Revision Contents
Changeset List

Diff 34627

View Options

src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php

Loading...
View Options

src/applications/drydock/storage/DrydockRepositoryOperation.php

Loading...
View Options

src/applications/drydock/view/DrydockRepositoryOperationStatusView.php

Loading...
View Options

src/applications/drydock/worker/DrydockRepositoryOperationUpdateWorker.php

Loading...
Phabricator · Built by Phacility