Structure-oriented merging of revisions of software documents

Westfechtel, Bernhard

doi:10.1145/111062.111071

Cited by 83 publications

(44 citation statements)

References 16 publications

Supporting

Mentioning

Contrasting

Order By: Relevance

“…Therefore, it can guarantee a syntactically correct result and can perform more intelligent merge decisions. However, syntactic merging has been realized only in a few research prototypes [Buffenbarger 1995;Westfechtel 1991]. -Semantic merging takes the semantics of programs into account [Berzins 1994[Berzins , 1995Binkley et al 1995;Horwitz et al 1989].…”

Section: Merge Toolsmentioning

confidence: 99%

“…Finally, for software engineering applications, a structure-oriented merge tool [Westfechtel 1991] provides for three-way merging of versions of software documents (e.g., requirements definitions, software architectures, module implementations) that are internally represented as abstract syntax graphs. The merge tool preserves context-free correctness and detects certain kinds of context-sensitive conflicts by analyzing bindings of identifiers to their declarations.…”

Section: 310mentioning

confidence: 99%

See 1 more Smart Citation

Version models for software configuration management

1998

Self Cite

View full text Add to dashboard Cite

After more than 20 years of research and practice in software configuration management (SCM), constructing consistent configurations of versioned software products still remains a challenge. This article focuses on the version models underlying both commercial systems and research prototypes. It provides an overview and classification of different versioning paradigms and defines and relates fundamental concepts such as revisions, variants, configurations, and changes. In particular, we focus on intensional versioning, that is, construction of versions based on configuration rules. Finally, we provide an overview of systems that have had significant impact on the development of the SCM discipline and classify them according to a detailed taxonomy.

show abstract

Section: Merge Toolsmentioning

confidence: 99%

Section: 310mentioning

confidence: 99%

Version models for software configuration management

1998

Self Cite

View full text Add to dashboard Cite

show abstract

“…Other syntactical, tree-based differencing approaches were also used in program differencing and merging tools [24,25]. Their goals were not to detect editing operations.…”

Section: Related Workmentioning

confidence: 99%

Operation-Based, Fine-Grained Version Control Model for Tree-Based Representation

Nguyen

Pham

et al. 2010

Fundamental Approaches to Software Engineering

View full text Add to dashboard Cite

Abstract. Existing version control systems are often based on text line-oriented models for change representation, which do not facilitate software developers in understanding code evolution. Other advanced change representation models that encompass more program semantics and structures are still not quite practical due to their high computational complexity. This paper presents OperV, a novel operation-based version control model that is able to support both coarse and fine levels of granularity in program source code. In OperV, a software system is represented by a project tree whose nodes represent all program entities, such as packages, classes, methods, etc. The changes of the system are represented via edit operations on the tree. OperV also provides the algorithms to differ, store, and retrieve the versions of such entities. These algorithms are based on the mapping of the nodes between versions of the project tree. This mapping technique uses 1) divide-and-conquer technique to map coarse-and fine-grained entities separately, 2) unchanged text regions to map unchanged leaf nodes, and 3) structure-based similarity of the sub-trees to map their root nodes bottom-up and then topdown. The empirical evaluation of OperV has shown that it is scalable, efficient, and could be useful in understanding program evolution.

show abstract

“…This paper presents a novel approach to model merging [2] which is intended to bring gains to those working on collaborative software development. Whilst, in our case the primary objects (in the wider rather than software sense) are UML models, the lessons learned here have implications for collaboration more widely, where any shared artefact may be developed in a similar collaborative manner (based on diagrammatic modelling notations).…”

Section: Introduction: the Need For Merging Models Within Collaboratimentioning

confidence: 99%

Supporting Collaborative Work by Preserving Model Meaning When Merging Graphical Models

Phalp

Grimm²,

2012

IFIP Advances in Information and Communication Technology

View full text Add to dashboard Cite

Abstract. An important aspect of support for distributed work is to enable users at different sites to work collaboratively; models need to be accessible by more than one user at a time allowing them to modify them independently from each other supporting parallel evolution [1]. As design is a largely creative process users also use layout to convey meaning. However, tools for merging such models tend to do so from a purely structural perspective, thus losing an important aspect of the meaning conveyed by the modeller. This paper presents a novel approach to model merging which allows us to preserve such layout meaning when merging. We first present evidence from an industrial study, which demonstrates how users use layout to convey specific meanings. We then introduce an approach to merging which will allow for the preservation of meaning and finally describe a prototype tool.

show abstract

Structure-oriented merging of revisions of software documents

Cited by 83 publications

References 16 publications

Version models for software configuration management

Version models for software configuration management

Operation-Based, Fine-Grained Version Control Model for Tree-Based Representation

Supporting Collaborative Work by Preserving Model Meaning When Merging Graphical Models

Contact Info

Product

Resources

About