Don't allow merging folders and livemarks #13
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhammond
approved these changes
Aug 31, 2018
|
(and the fact livemarks are going away helps me be confident deploying the rubber-stamp - although I guess there will be some interesting considerations on desktop (even with the old merger) when they die. |
This requires removing the entire subtree, in case we're merging a folder with children on one side, and a livemark on the other. Since we're removing livemarks in bug 1477667, we can remove this entirely instead of adding complexity to the merger.
linabutler
force-pushed
the
folders-livemarks-incompatible
branch
from
d602513
to
62a7b59
Compare
3 tasks
linabutler
added a commit
that referenced
this pull request
Feb 17, 2019
For mismatched kinds, we keep both nodes with new GUIDs. This is an edge case: Places maintenance on Desktop can change an item's kind without changing its GUID, but this should be rare. In general, we can't meaningfully pick a side when two items have different kinds (a bookmark and a folder with children? a bookmark and a separator?), so we keep both, with new structure, to avoid possible data loss. See #13.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This won't go well if the folder somehow has children on one side. (Livemarks haven't had real children for a while, as seen in bug 632287, but the folder can still be modified locally). Since we're removing livemarks in bug 1477667, we can probably remove this entirely instead of adding complexity to the merger.