Page MenuHomePhabricator
Differential D16164

Resolve relationship edit conflicts more naturally
ClosedPublic
Actions

Authored by epriestley on Jun 22 2016, 3:36 PM.
Tags
None
Referenced Files
F13146824: D16164.diff
Fri, May 3, 10:38 AM
Unknown Object (File)
Thu, Apr 25, 3:56 AM
Unknown Object (File)
Sun, Apr 21, 11:15 PM
Unknown Object (File)
Sun, Apr 21, 12:10 PM
Unknown Object (File)
Fri, Apr 19, 2:29 AM
Unknown Object (File)
Fri, Apr 19, 2:29 AM
Unknown Object (File)
Fri, Apr 19, 2:29 AM
Unknown Object (File)
Thu, Apr 11, 3:49 AM
View All Files
Subscribers
None

Details

Reviewers
chad
Maniphest Tasks
T4768: Phabricator silently overwrites concurrent changes (no conflict detection)
T11179: Figure out what to do with "Edit Blocking Tasks", "Edit Differential Revisions" and "Edit Pholio Mocks"
Commits
rP4bbe6f307a7a: Resolve relationship edit conflicts more naturally
Summary

Ref T11179. Ref T4768. Currently, on master, if two users open "Edit Revisions" at the same time, then add revisions A and B, only the last state wins (just "B").

Instead, apply these as "add A" and "add B" so they merge in a natural way.

Test Plan
  • Opened edit dialog in two windows.
  • Added "A" in one, "B" in the other.
  • Saved both.
  • Saw "Added A" and "Added B" transactions, instead of "Added A" and "Removed A, added B".

Diff Detail

Repository
rP Phabricator
Branch
relation3
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 12763
Build 16244: Run Core Tests
Build 16243: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 38882.Jun 22 2016, 3:36 PM
epriestley retitled this revision from to Resolve relationship edit conflicts more naturally.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
epriestley added tasks: T11179: Figure out what to do with "Edit Blocking Tasks", "Edit Differential Revisions" and "Edit Pholio Mocks", T4768: Phabricator silently overwrites concurrent changes (no conflict detection).
chad accepted this revision.Jun 22 2016, 4:53 PM
chad edited edge metadata.
This revision is now accepted and ready to land.Jun 22 2016, 4:53 PM
Closed by commit rP4bbe6f307a7a: Resolve relationship edit conflicts more naturally (authored by epriestley, committed by epriestley). · Explain WhyJun 22 2016, 6:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
resources/
celerity/
18 lines
src/
applications/
search/
controller/
13 lines
view/
control/
16 lines
webroot/
rsrc/
js/
core/
13 lines

Diff 38882

View Options

resources/celerity/map.php

Loading...
View Options

src/applications/search/controller/PhabricatorSearchRelationshipController.php

Loading...
View Options

src/view/control/PhabricatorObjectSelectorDialog.php

Loading...
View Options

webroot/rsrc/js/core/behavior-object-selector.js

Loading...
Phabricator · Built by Phacility