Summary
The problem of combining independent updates to a program is examined in the context of applicative programs. A partial semantic merge rule is given together with the conditions under which it is guaranteed to be correct, and the conditions under which a string merge corresponds to a semantic merge are examined. The theoretical work reported here contains initial steps towards a solution of the software merging problem and is not sufficient for producing a practical system.
Similar content being viewed by others
References
Goldstein, I.P., Bobrow, D.G.: Descriptions for a Programming Environment. Proc. Conf. of the National Association for Artificial Intelligence, 187–189 (1980)
Rochkind, M.J.: The Source Code Control System. IEEE Trans. Software Eng. SE-1, 364–370 (1975)
Ivie, E.L.: The Programmer's Workbench — A Machine for Software Development. CACM 20, 746–753 (1977)
Tichy, W.F.: Design, Implementation, and Evaluation of a Revision Control System. Proc. of the 6th Int. Conf. on Software Engineering, IEEE, 58–67 (1982)
Scott, D.: The Lattice of Flow Diagrams. Technical Monograph PRG-3, Oxford University 1970
Moriconi, M.S.: A Designer/Verifier's Assistant. IEEE Trans. Software Eng. SE-5, 387–401 (1979)
Scott, D.: Data Types as Lattices. SIAM J. Comput. 5, 522–587 (1976)
Stoy, J.: Denotational Semantics: The Scott-Strachey Approach to Programming Language Theory. Cambridge: MIT Press 1977
Milne, R., Strachey, C.: A Theory of Programming Language Semantics. Sommerset, NJ: Halstead Press 1976
Birkhoff, G., Lipson, J.D.: Heterogeneous Algebras. J. Comb. Theory 8, 115–133 (1970)
McCarthy, J.: A Basis for a Mathematical Theory of Computation. Computer Programming and Formal Systems. Amsterdam, London: North Holland 1963
Manna, Z., Ness, S., Vuillemin, J.: Inductive Methods for Proving Properties of Programs. CACM 16, 491–502 (1973)
Knuth, D.E., Bendix, P.B.: Simple Word Problems in Universal Algebras. Computational Problems in Abstract Algebra, pp. 263–297. New York: Pergamon Press 1970
Huet, G.: A Complete Proof of Correctness of the Knuth-Bendix Completion Algorithm. J. Comput. Syst. Sci. 23, 11–21 (1981)
Author information
Authors and Affiliations
Rights and permissions
About this article
Cite this article
Berzins, V. On merging software extensions. Acta Informatica 23, 607–619 (1986). https://doi.org/10.1007/BF00264309
Received:
Issue Date:
DOI: https://doi.org/10.1007/BF00264309