Abstract

This study presents a fine-grained approach to the problem of conflict detection and merging in model-based Software Configuration Management (SCM) systems. Traditional SCM systems uses textual or structured data to represent models at fine-grained level. Our approach is based on defining graph structure to represent models data at fine-grained level. The approach is based on transforming the textual or structured data into graph structure and then performing the diff, merge and evolution control activities at the graph structure whereas versioning activities should remains at textual or structural representation. By doing so, at one hand we are getting the advantages of reusing the existing SCM systems for versioning purposes and on other hand avoiding the problems associated with textual or structured representation when performing rest of the SCM activities.

Keywords:

Conflict detection , fine-granular representation , merging, model-based SCM, versioning,

References

1. Mehra, A., J. Grundy and J. Hosking, 2005. A generic approach to supporting diagram differencing and merging for collaborative design. Proceeding of the 20th IEEE/ACM International Conference on Automated Software Engineering (ASE'05), pp: 204-213.
   CrossRef    
2. Michael, P., 2004. Version Control with Subversion. O'Reilly and Associates, Inc., Sebastopol, CA, USA.
   
3. Ogasawara, E., P. Rangel, L. Murta, C. Werner and M. Mattoso, 2009. Comparison and versioning of scientific workflows. Proceeding of the ICSE Workshop on Comparison and Versioning of Software Models (CVSM '09), pp: 25-30.
   CrossRef    
4. Ohst, D. and U. Kelter, 2002. A fine-grained version and configuration model in analysis and design. Proceeding of the International Conference on Software Maintenance (ICSM'02), pp: 521-527.
   CrossRef    
5. Ohst, D., M. Welle and U. Kelter, 2003. Differences between versions of UML diagrams. Proceeding of the 9th European Software Engineering Conference Held Jointly with 11th ACM SIGSOFT International Symposium on Foundations of Software Engineering (ESEC/FSE-11), pp: 227-236.
   CrossRef    
6. Ohst, D., M. Welle and U. Kelter, 2004. Merging UML documents. Technical Report, Department of Electrical Engineering and Computer Science, University of Siegen, Germany, 2004. Internal Report.
   PMid:15472291 PMCid:PMC522327    
7. Oliveira, H., L. Murta and C. Werner, 2005. Odyssey-VCS: A flexible version control system for UML model elements. Proceeding of the 12th International Workshop on Software Configuration Management (SCM'05), pp: 1-16.
   CrossRef    PMCid:PMC3663406    
8. Schneider, C., A. Zündorf and J. Niere, 2004. CoObRA-a small step for development tools to collaborative environments. Proceeding of 26th International Conference on Software Engineering Workshop on Directions in Software Engineering Environments. Edinburgh, Scotland, UK.
   CrossRef    

Competing interests

The authors have no competing interests.

Open Access Policy

This article is distributed under the terms of the Creative Commons Attribution 4.0 International License (http://creativecommons.org/licenses/by/4.0/), which permits unrestricted use, distribution, and reproduction in any medium, provided you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license, and indicate if changes were made.

Copyright

The authors have no competing interests.