1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-23 13:08:18 +01:00
phorge-phorge/src
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
..
__tests__ Use PhutilClassMapQuery instead of PhutilSymbolLoader 2015-08-14 07:49:01 +10:00
aphront Continue modernizing application access to user preferences 2016-06-04 14:37:56 -07:00
applications Resolve relationship edit conflicts more naturally 2016-06-22 11:17:30 -07:00
docs Support AES256 at-rest encryption in Files 2016-06-16 08:08:56 -07:00
extensions Add src/extensions/ to Phabricator 2013-08-14 15:38:06 -07:00
infrastructure Fix parsing of anchors in Phriction document link syntax 2016-06-08 13:14:33 -07:00
view Resolve relationship edit conflicts more naturally 2016-06-22 11:17:30 -07:00
__phutil_library_init__.php
__phutil_library_map__.php Drive modular task relationships through a new "relationships" controller 2016-06-22 11:16:58 -07:00