Tony Garnock-Jones presented JavaScript diff3, merging, and DVCS (video) of which you can learn more in his blog post.
From the presentation:
- Version Control can seem jolly difficult if you tangle all the pieces together (CVS, SVN, …)
- Merging is the most important bit for correctness; storage design is important for usability
- Little Unix-style composable tools are the way to go (but user interface is also very important)
Which does make sense to me. And different VCS (distributed and centralized sharing more of the same code would also be nice).
And from the comments:
The idea is to see if it can be put into TiddlyWiki somehow – but there are plenty of other uses for a decentralised JSON synchronisation mechanism: bookmarks, calendar entries, contact lists, …