1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-13 10:22:42 +01:00
phorge-phorge/webroot/rsrc
epriestley 4bbe6f307a 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".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T4768, T11179

Differential Revision: https://secure.phabricator.com/D16164
2016-06-22 11:17:30 -07:00
..
css Clean up menu folding in action list 2016-06-21 14:39:55 -07:00
externals Allow dialogs to opt in to being resizable 2016-06-20 19:13:58 -07:00
favicons Add mask-icon for Safari pinned tab 2015-11-22 13:04:06 -08:00
image Allow dialogs to opt in to being resizable 2016-06-20 19:13:58 -07:00
js Resolve relationship edit conflicts more naturally 2016-06-22 11:17:30 -07:00