Paths

Table of Contentst

Differential D16164

Resolve relationship edit conflicts more naturally
ClosedPublic
Actions

Authored by epriestley on Jun 22 2016, 3:36 PM.

Tags

None

Referenced Files

	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

	Unknown Object (File)
	Wed, Apr 10, 11:10 AM

	Unknown Object (File)
	Tue, Apr 2, 9:22 AM

Subscribers

None

Details

Reviewers

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

Lint

Lint Not Applicable

Unit

Tests Not Applicable

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

Path

Size

resources/

celerity/

18 lines

src/

applications/

search/

controller/

PhabricatorSearchRelationshipController.php

13 lines

view/

control/

PhabricatorObjectSelectorDialog.php

16 lines

webroot/

rsrc/

js/

core/

behavior-object-selector.js

13 lines

Diff 38888

resources/celerity/map.php

Loading...

src/applications/search/controller/PhabricatorSearchRelationshipController.php

Loading...

src/view/control/PhabricatorObjectSelectorDialog.php

Loading...

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

Loading...