A three-way merge for XML documents

Proceedings of the 2004 ACM Symposium on Document Engineering

Volumn , Issue , 2004, Pages 1-10

  Lindholm, Tancred ^a  

^a HELSINKI INSTITUTE FOR INFORMATION TECHNOLOGY   (Finland)

Author keywords

Collaborative editing; Conflict; Structured text; Three way merge; XML

Indexed keywords

ALGORITHMS; COMPUTER SUPPORTED COOPERATIVE WORK; FILE EDITORS; INFORMATION RETRIEVAL SYSTEMS; TEXT PROCESSING; TREES (MATHEMATICS);

COLLABORATIVE EDITING; CONFLICT; STRUCTURED TEXT; THREE-WAY MERGE;

XML;

EID: 20344380423     PISSN: None     EISSN: None     Source Type: Conference Proceeding    
DOI: 10.1145/1030397.1030399     Document Type: Conference Paper

References (17)

1. S. Balasubramaniam and Benjamin C. Pierce. What is a file synchronizer? In Fourth Annual ACM/IEEE International Conference on Mobile Computing and Networking (MobiCom '98), pages 98-108.
2. Sudarshan S. Chawathe and Hector Garcia-Molina. Meaningful change detection in structured data. In Proceedings of the 1997 ACM SIGMOD International Conference on Management of Data, pages 26-37. ACM Press, 1997.
3. Sudarshan S. Chawathe, Anand Rajaraman, Hector Garcia-Molina, and Jennifer Widom. Change detection in hierarchically structured information. In ACM SIGMOD International Conference on Management of Data (SIGMOD), pages 493-504, 1996.
4. S. Horwitz, J. Prins, and T. Reps. Integrating noninterfering versions of programs. ACM Transactions on Programming Languages and Systems, 11(3):345-387, 1989.
5. th Annual IEEE Symposium on Foundations of Computer Science, pages 8-21, October 1978.
6. Michael K. Johnson. Diff, patch, and friends. Linux Journal, 1996(28es), August 1996.
7. R. la Fontaine. Merging XML files: a new approach providing intelligent merge of XML data sets. In Proceedings of XML Europe 2002, Barcelona, Spain.
8. G. W. Manger. A generic algorithm for merging SGML/XML-instances. In Proceedings of XML Europe 2001, Berlin, Germany.
9. Tom Mens. A state-of-the-art survey on software merging. IEEE Transactions on Software Engineering, 28(5):449-462, May 2002.
10. Eugene W. Myers. An O(ND) difference algorithm and its variations. Algorithmica, 1(2):251-266, 1986.
11. Sun Microsystems. OpenOffice.org XML File Format 1.0, December 2002. http://xml.openoffice.org/xml_specification.pdf.
12. Asklund U. Identifying conflicts during structural merge. In Proceedings of the Nordic Workshop on Programming Environment Research '94, pages 231-242, Lund, Sweden, June 1994.
13. rd edition, October 2000. http://www.w3.org/TR/REC-xml/.
14. W3C. XHTML 1.0 Specification, January 2000. http://www.w3.org/TR/xhtml1/.
15. W3C. Scalable Vector Graphics (SVG) 1.1 Specification, January 2003. http://www.w3.org/TR/SVG/.
16. nd edition, February 2004. http://www.w3.org/TR/xml-infoset/.
17. rd International Workshop on Software Configuration Management, pages 68-79. ACM Press, 1991.