Page MenuHomePhabricator

Don't warn about conflicts when reverting Phriction documents
ClosedPublic

Authored by epriestley on May 21 2014, 9:48 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mar 14 2026, 8:41 AM
Unknown Object (File)
Mar 4 2026, 12:28 AM
Unknown Object (File)
Feb 1 2026, 10:33 AM
Unknown Object (File)
Jan 31 2026, 6:36 AM
Unknown Object (File)
Jan 4 2026, 10:46 AM
Unknown Object (File)
Oct 29 2025, 2:20 PM
Unknown Object (File)
Oct 24 2025, 6:40 PM
Unknown Object (File)
Oct 5 2025, 4:21 AM
Subscribers

Details

Summary

Fixes T5144. This was incorrectly checking the content version, not the head version, so reverts would raise the "conflict" warning.

Also fix a couple of FontAwesome icons.

Test Plan
  • Edited a document.
  • Reverted a document.
  • Opened two edit tabs. Edited one, tried to edit #2, got a warning.
  • Opened two revert tabs. Reverted in one, tried to revert in #2, got a warning.

Diff Detail

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

Event Timeline

epriestley retitled this revision from to Don't warn about conflicts when reverting Phriction documents.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added reviewers: btrahan, chad.
chad edited edge metadata.
This revision is now accepted and ready to land.May 21 2014, 10:58 PM
epriestley updated this revision to Diff 21965.

Closed by commit rP3c8d88deb454 (authored by @epriestley).