Article

Revision control system using delta script of syntax tree

Authors:

Yasuhiro Hayase,

Makoto Matsushita,

Katsuro InoueAuthors Info & Claims

SCM '05: Proceedings of the 12th international workshop on Software configuration management

Pages 133 - 149

https://doi.org/10.1145/1109128.1109138

Published: 05 September 2005 Publication History

Get Access

Abstract

In an opensource development process developers work together using a revision control system. While getting multi-developers working products together into a single form, merge feature of revision control systems is used. Nowadays, merge operations in existing systems are commonly implemented with a line-by-line approach that can fail if two changes to the same line of code happen at the same time.In this paper, we propose a two-way merge algorithm for source code that exploit the tree structure of modern programming language grammar: the source code is transformed in an intermediate XML representation and the merge operation is conducted on the transformed version.We give an implementation of the algorithm for the Java language for the subversion revision control system.Experiments shown that the proposed algorithm gives more accurate merge result than the existing line-by-line algorithms.

References

[1]

subversion. http://subversion.tigris.org/.

Google Scholar

[2]

D. Binkley, S. Horwitz, and T. Reps. Program integration for languages with procedure calls. ACM Trans. Softw. Eng. Methodol., 4(1):3--35, 1995.

Digital Library

Google Scholar

[3]

S. S. Chawathe, A. Rajaraman, H. Garcia-Molina, and J. Widom. Change detection in hierarchically structured information. In Proceedings of the ACM SIGMOD International Conference on Management of Data, pages 493--504, 1996.

Digital Library

Google Scholar

[4]

S.-Y. Chien, V. J. Tsotras, and C. Zaniolo. Version management of XML documents. Lecture Notes in Computer Science, 1997:184--189, 2001.

Digital Library

Google Scholar

[5]

S.-Y. Chien, V. J. Tsotras, and C. Zaniolo. XML document versioning. SIGMOD Record, 30(3):46--53, 2001.

Digital Library

Google Scholar

[6]

S. Horwitz, J. Prins, and T. Reps. Integrating noninterfering versions of programs. ACM Trans. Program. Lang. Syst., 11(3):345--387, 1989.

Digital Library

Google Scholar

[7]

A. Kermarrec, A. Rowstron, M. Shapiro, and P. Druschel. The IceCube approach to the reconciliation of divergent replicas. In Twentieth ACM Symposium on Principles of Distributed Computing (PODC), August 2001.

Digital Library

Google Scholar

[8]

T. Mens. A state-of-the-art survey on software merging. IEEE Trans. Softw. Eng., 28(5):449--462, 2002.

Digital Library

Google Scholar

[9]

M. Shapiro, A. Rowstron, and A.-M. Kermarrec. Application-independent reconciliation for nomadic applications. In Proc. SIGOPS European Workshop: "Beyond the PC: New Challenges for the Operating System", Kolding (Denmark), 2000.

Digital Library

Google Scholar

[10]

B. Westfechtel. Structure-oriented merging of revisions of software documents. In Proceedings of the 3rd international workshop on Software configuration management, pages 68--79, New York, NY, USA, 1991. ACM Press.

Digital Library

Google Scholar

[11]

W. Yang. Identifying syntactic differences between two programs. Softw. Pract. Exper., 21(7):739--755, 1991.

Digital Library

Google Scholar

Cited By

View all

Hayase YKanda TIshio TLozano ÁRobles G(2015)Estimating product evolution graph using Kolmogorov complexityProceedings of the 14th International Workshop on Principles of Software Evolution10.1145/2804360.2804368(66-72)Online publication date: 30-Aug-2015
https://dl.acm.org/doi/10.1145/2804360.2804368

Recommendations

Obstacle-avoiding rectilinear Steiner tree construction
ICCAD '08: Proceedings of the 2008 IEEE/ACM International Conference on Computer-Aided Design

In today's VLSI designs, there can be many blockages in a routing region. The obstacle-avoiding rectilinear Steiner minimum tree (OARSMT) problem has become an important problem in the physical design stage of VLSI circuits. This problem has attracted a ...
Floorplanning using a tree representation

We present an ordered tree (O tree) structure to represent nonslicing floorplans. The O tree uses only n(2+[lg n]) bits for a floorplan of n rectangular blocks. We define an admissible placement as a compacted placement in both x and y directions. For ...
Filtered Belief Revision: Syntax and Semantics
Abstract
In an earlier paper [Rational choice and AGM belief revision, Artificial Intelligence, 2009] a correspondence was established between the set-theoretic structures of revealed-preference theory (developed in economics) and the syntactic belief ...

Comments

Please enable JavaScript to view thecomments powered by Disqus.

Information & Contributors

Information

Published In

SCM '05: Proceedings of the 12th international workshop on Software configuration management

September 2005

147 pages

ISBN:1595933107

DOI:10.1145/1109128

Permission to make digital or hard copies of all or part of this work for personal or classroom use is granted without fee provided that copies are not made or distributed for profit or commercial advantage and that copies bear this notice and the full citation on the first page. Copyrights for components of this work owned by others than ACM must be honored. Abstracting with credit is permitted. To copy otherwise, or republish, to post on servers or to redistribute to lists, requires prior specific permission and/or a fee. Request permissions from [email protected]

Publisher

Association for Computing Machinery

New York, NY, United States

Publication History

Published: 05 September 2005

Permissions

Request permissions for this article.

Request Permissions

Check for updates

Qualifiers

Article

Conference

SCM-12

SCM-12: 12th International Workshop on Software Configuration Management 2005

September 5 - 6, 2005

Lisbon, Portugal

Contributors

Other Metrics

View Article Metrics

Bibliometrics & Citations

Bibliometrics

Article Metrics

1
Total Citations
View Citations
285
Total Downloads

Downloads (Last 12 months)0
Downloads (Last 6 weeks)0

Reflects downloads up to 11 Dec 2024

Other Metrics

View Author Metrics

Citations

Cited By

View all

Hayase YKanda TIshio TLozano ÁRobles G(2015)Estimating product evolution graph using Kolmogorov complexityProceedings of the 14th International Workshop on Principles of Software Evolution10.1145/2804360.2804368(66-72)Online publication date: 30-Aug-2015
https://dl.acm.org/doi/10.1145/2804360.2804368

View Options

Login options

Check if you have access through your login credentials or your institution to get full access on this article.

Cited By

Recommendations

Obstacle-avoiding rectilinear Steiner tree construction

Floorplanning using a tree representation

Filtered Belief Revision: Syntax and Semantics