A Formal Investigation of Diff3

Khanna, Sanjeev; Kunal, Keshav; Pierce, Benjamin C.

doi:10.1007/978-3-540-77050-3_40

Cited by 42 publications

(35 citation statements)

References 8 publications

Supporting

Mentioning

Contrasting

Unclassified

Order By: Relevance

“…In the domain of line-based deltas, this concept has proven its strength in the GNU diffutils [11,13]. Its application to the XML domain and the use of hashing techniques however is new -no similar approach is known to us.…”

Section: Related Workmentioning

confidence: 99%

“…These approaches are based on two internal 2-way diff runs -actually, the merges are computed by comparing the resulting edit sripts. In [11], a best-effort approach for merging is used, too, which assets and drawbacks are discussed in [13]. The delta model in [18] differs from ours, reverting changes is not possible.…”

Section: Related Workmentioning

confidence: 99%

“…Among others, they can be divided in operationbased and state-based systems [12,13]. The main advantage of the operation-based approach is that it retains information about the evolution of a document state, thus allowing to perform a fine-grained merge.…”

Section: Introductionmentioning

confidence: 99%

“…In most collaboration and versioning scenarios however, it is crucial to be able to merge changes performed independently on a document [1]. As a solution, a three-way-diff could be used, which compares the changed versions of a document with their nearest common ancestor [13]. An XML-aware implementation was proposed, too [18].…”

Section: Introductionmentioning

confidence: 99%

See 3 more Smart Citations

Merging changes in XML documents using reliable context fingerprints

Rönnau

Pauli

Borghoff

2008

Proceedings of the Eighth ACM Symposium on Document Engineering

View full text Add to dashboard Cite

Different dialects of XML have emerged as ubiquitous document exchange formats. For effective collaboration based on such documents, the capability to propagate edit operations performed on a document is indispensable. In order to avoid the transmission of whole documents, deltas are used to describe these edit operations, allowing the construction of a new version of a document. However, patching a document with a delta it was not generated for is error-prone, and any insert or delete operations performed on the document are likely to affect all subsequent paths within that document.In this paper, we present a delta format for XML documents that uses context-aware fingerprints to identify edit operations. This allows our XML patch procedure to find the correct position of an edit operation, even if the document was updated in the meantime. Possible conflicts are detected. Experimental results show the reliability of the presented fingerprinting technique and prove the high quality of the resulting patched documents.

show abstract

Section: Related Workmentioning

confidence: 99%

Section: Related Workmentioning

confidence: 99%

Section: Introductionmentioning

confidence: 99%

Section: Introductionmentioning

confidence: 99%

See 2 more Smart Citations

Merging changes in XML documents using reliable context fingerprints

Rönnau

Pauli

Borghoff

2008

Proceedings of the Eighth ACM Symposium on Document Engineering

View full text Add to dashboard Cite

show abstract

“…Git system uses a state − based approach to manage the concurrent modifications, called three-way-merge (diff3) [35], [16]. During the merge procedure, it compares the local state with the remote one.…”

Section: Introductionmentioning

confidence: 99%

Improving Textual Merge Result

Ahmed-Nacer¹,

Urso²,

Charoy³

2013

Proceedings of the 9th IEEE International Conference on Collaborative Computing: Networking, Applications and Worksharing

View full text Add to dashboard Cite

Abstract-In asynchronous collaborative systems, merging is an essential component. It allows to reconcile modifications made concurrently as well as managing software change through branching. The collaborative system is in charge to propose a merge result that includes user's modifications. The users now have to check and adapt this result. The adaptation should be as effort-less as possible, otherwise, the users may get frustrated and will quit the collaboration.The objective of this paper is to improve the result quality of the textual merge tool that constitutes the default merge tool of distributed version control systems. The basic idea is to study the behavior of the concurrent modifications during merge procedure. We identified when the existing merge techniques under-perform, and we propose solutions to improve the quality of the merge. We finally compare with the traditional merge tool through a large corpus of collaborative editing.

show abstract