-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ReIndex now rebases local pending changes #295
Merged
jleandroperez
merged 18 commits into
issues/291-change-processor-error-handling
from
issues/294-reindex-now-rebases-local-pending-changes
Jun 18, 2014
Merged
ReIndex now rebases local pending changes #295
jleandroperez
merged 18 commits into
issues/291-change-processor-error-handling
from
issues/294-reindex-now-rebases-local-pending-changes
Jun 18, 2014
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
…/294-reindex-now-rebases-local-pending-changes
Merging SPChangeProcessor’s ‘processRemoteEntity’ behavior with SPIndexProcessor’s processVersions method.
jleandroperez
added a commit
that referenced
this pull request
Jun 18, 2014
…nding-changes ReIndex now rebases local pending changes
jleandroperez
deleted the
issues/294-reindex-now-rebases-local-pending-changes
branch
June 18, 2014 15:29
3 tasks
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.
Legacy Re-Index Behavior:
shouldOverwriteLocalChangesFromIndex
selector (and returns YES), we override the local data with the remote data.h the remote version, local data is overwritten.
We'll be updating this behavior to be consistent with this SPChangeProcessor enhancement.
New Re-Index Behavior:
For each one of the objects in the index, we should:
3.1. Calculate Delta: LocalGhost > RemoteMembers
3.2. Transform localDiff: LocalGhost >> RemoteMembers >> LocalDiff (equivalent to git rebase)
3.3. Attempt to apply the Local Transformed Diff