Ward/relative move #52
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
This error computing revisions from the journal would cause a reconstruction to be incorrect if there were any add to the first position of the story. This must be unlikely because it hasn't been noticed. Client now agrees with server. Both ruby and node versions already agreed.
We construct a relative address for a move action from the item id ordering provided by the move action. The relative address identifies what item the moved item will follow. Notice that this approach is only used client-side. The servers can continue applying moves as they always have. The two methods should be equivalent when retrieving older revisions from the version history so long as the history follows a single thread. The relative form allows us to mash multiple histories together and then 'fork' the resulting construction over top of once single-threaded versions.
This was referenced Aug 4, 2014
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 pull request is motivated by the drag-and-drop merging of journals. This has turned out to be a lot more work than expected, mostly due to carelessly conceived unit tests that confused more than illuminated my work. I've chosen to use the node-server implementation as the definition of 'correct' where it and the unit tests disagreed.
I've replaced the unit tests with smaller and more comprehensive tests based on a situation modeling language which is itself tested as a prolog to the tests. For example, here we create a page with three items:
This says: the story is to be three paragraphs, t1, t2, and t3. These are created by adding t1, then t2 after t1, and then t3 at the beginning (after nothing). A reasonable test would be to retrieve the final version and verify that the paragraphs are indeed in the order t3, t1, t2.
With good tests the modifications to lib/revision.coffee were straightforward.