Merge: complete rewrite #301
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
le-jeu
force-pushed
the
merge_zone
branch
3 times, most recently
from
0f40358
to
bb428b8
Compare
le-jeu
force-pushed
the
merge_zone
branch
2 times, most recently
from
af3dc23
to
f6a2151
Compare
| type: "edition", | ||
| props: computeDiff(origin, current, [ | ||
| "type", | ||
| /*"portalId",*/ // unlikely because we don't swap marker yet |
There was a problem hiding this comment.
I thought we'd added (or were planning on adding) maker swap
There was a problem hiding this comment.
"yet", also what swaping marker does has to be defined first,
preserving the link ID on anchor swap allow to track anchor and resolve situation where one moved an anchor while another assigned it
imo, marker don't need this refinement and can change ID on swap
| } | ||
| return this.localchanged; | ||
| } | ||
|
|
||
| mergeZones(op: WasabeeOp) { | ||
| const ids = new Set(); | ||
| const ids = new Map<ZoneID, WasabeeZone>(); |
Merged
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 PR splits the merge feature from the operation model.
The merge feature follow a rebase mechanism using the common ancestor of the operations to be merged.
We always have a
mastercopy (server), thefollower(local) and the ancestororiginthat was saved inlocaldata at last fetch.The merge is structured in 4 steps:
masterChange: difference betweenmasterandorigin(what's new on the server)followerChange: difference betweenfollowerandorigin(what did I changed or fb event changed)followerChange - masterChange: compute what are the local changes that are not onmasterconflict may arise: we change smth that is not on
masteranymore, we change something both onmasterandfolloweretcmasterandfollowerversionmasterwhat was previously computed and uses the resolved conflicts at step 3The merge dialog is reworked to match the step 3.
operation.changes()is simplified to return a boolean instead of the computed changes.