Algorithms for approximate string matching
Information and Control
Change detection in hierarchically structured information
SIGMOD '96 Proceedings of the 1996 ACM SIGMOD international conference on Management of data
A State-of-the-Art Survey on Software Merging
IEEE Transactions on Software Engineering
A three-way merge for XML documents
Proceedings of the 2004 ACM symposium on Document engineering
Exploiting schemas in data synchronization
Journal of Computer and System Sciences
Merging changes in XML documents using reliable context fingerprints
Proceedings of the eighth ACM symposium on Document engineering
Versioning XML-based office documents
Multimedia Tools and Applications
Supporting Parallel Updates with Bidirectional Model Transformations
ICMT '09 Proceedings of the 2nd International Conference on Theory and Practice of Model Transformations
Using versioned tree data structure, change detection and node identity for three-way XML merging
Proceedings of the 10th ACM symposium on Document engineering
Diffing, patching and merging XML documents: toward a generic calculus of editing deltas.
Proceedings of the 10th ACM symposium on Document engineering
A generic calculus of XML editing deltas
Proceedings of the 11th ACM symposium on Document engineering
XCC: change control of XML documents
Computer Science - Research and Development
Synchronizing concurrent model updates based on bidirectional transformation
Software and Systems Modeling (SoSyM)
| Hi-index | 0.00 |
The diff3 algorithm is widely considered the gold standard formerging uncoordinated changes to list-structured data such as text files. Surprisingly, its fundamental properties have never been studied in depth. We offer a simple, abstract presentation of the diff3 algorithm and investigate its behavior. Despite abundant anecdotal evidence that people find diff3's behavior intuitive and predictable in practice, characterizing its good properties turns out to be rather delicate: a number of seemingly natural intuitions are incorrect in general. Our main result is a careful analysis of the intuition that edits to "well-separated" regions of the same document are guaranteed never to conflict.