Page MenuHomePhabricator
Differential D9167

Add very basic conflict detection to Phriction
ClosedPublic
Actions

Authored by epriestley on May 17 2014, 8:39 PM.
Tags
None
Referenced Files
F14371833: D9167.diff
Fri, Dec 20, 7:20 PM
Unknown Object (File)
Thu, Dec 12, 10:08 AM
Unknown Object (File)
Thu, Dec 12, 9:45 AM
Unknown Object (File)
Mon, Dec 9, 12:06 PM
Unknown Object (File)
Fri, Dec 6, 1:24 PM
Unknown Object (File)
Fri, Dec 6, 7:19 AM
Unknown Object (File)
Wed, Nov 27, 9:13 AM
Unknown Object (File)
Oct 31 2024, 1:59 PM
View All Files
Subscribers
epriestley
Tokens
"The World Burns" token, awarded by chad.

Details

Reviewers
btrahan
Maniphest Tasks
T4768: Phabricator silently overwrites concurrent changes (no conflict detection)
Commits
Restricted Diffusion Commit
rPb1ec4a9a21a3: Add very basic conflict detection to Phriction
Summary

Ref T4768. This is extremely basic, but will stop conflicts from going silently unnoticed.

Test Plan

Screen_Shot_2014-05-17_at_1.37.48_PM.png (1×1 px, 150 KB)

Diff Detail

Repository
rP Phabricator
Branch
conflict
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 532
Build 532: [Placeholder Plan] Wait for 30 Seconds

Event Timeline

epriestley updated this revision to Diff 21775.May 17 2014, 8:39 PM
epriestley retitled this revision from to Add very basic conflict detection to Phriction.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: btrahan.
epriestley added a task: T4768: Phabricator silently overwrites concurrent changes (no conflict detection).
Herald added a subscriber: epriestley. · View Herald TranscriptMay 17 2014, 8:39 PM
Harbormaster completed remote builds in B532: Diff 21775.May 17 2014, 8:40 PM
chad awarded a token.May 17 2014, 9:19 PM
btrahan accepted this revision.May 19 2014, 6:16 PM
btrahan edited edge metadata.
This revision is now accepted and ready to land.May 19 2014, 6:16 PM
epriestley closed this revision.May 19 2014, 7:23 PM
epriestley updated this revision to Diff 21850.

Closed by commit rPb1ec4a9a21a3 (authored by @epriestley).

Revision Contents
Changeset List

PathSize
src/
applications/
phriction/
controller/
31 lines

Diff 21775

View Options

src/applications/phriction/controller/PhrictionEditController.php

Loading...
Phabricator · Built by Phacility