Skip to main content

Table-Driven Detection and Resolution of Operation-Based Merge Conflicts with Mirador

  • Conference paper
Modelling Foundations and Applications (ECMFA 2011)

Part of the book series: Lecture Notes in Computer Science ((LNPSE,volume 6698))

Included in the following conference series:

Abstract

Decision tables are a useful technique for implementing complex decision logic, and a concise communication device. Model merging is a process that can greatly benefit from the flexibility of control, rapidity of change, and understandability of purpose that tables engender.

Heretofore, users have been cut off from the inner workings of merge tools. Among its many features, our model merging tool, Mirador, opens the process of merging to inspection and manipulation. The tool’s support for user modification of the decision table rules that drive its conflict detection and resolution, as well as the possibility of adding customized table conditions and actions is the focus of this paper.

This is a preview of subscription content, log in via an institution to check access.

Access this chapter

Chapter
USD 29.95
Price excludes VAT (USA)
  • Available as PDF
  • Read on any device
  • Instant download
  • Own it forever
eBook
USD 39.99
Price excludes VAT (USA)
  • Available as PDF
  • Read on any device
  • Instant download
  • Own it forever
Softcover Book
USD 54.99
Price excludes VAT (USA)
  • Compact, lightweight edition
  • Dispatched in 3 to 5 business days
  • Free shipping worldwide - see info

Tax calculation will be finalised at checkout

Purchases are for personal use only

Institutional subscriptions

Preview

Unable to display preview. Download preview PDF.

Unable to display preview. Download preview PDF.

References

  1. Selic, B.: The pragmatics of model-driven development. IEEE Softw. 20(5), 19–25 (2003)

    Article  Google Scholar 

  2. Schmidt, D.C.: Guest editor’s introduction: Model-driven engineering. IEEE Comput. 39(2), 25–31 (2006)

    Article  Google Scholar 

  3. Barrett, S., Chalin, P., Butler, G.: Model merging falls short of software engineering needs. In: MoDSE 2008: Internat. Workshop on Model-Driven Software Evolution (April 2008)

    Google Scholar 

  4. Pierce, B.C., Vouillon, J.: What’s in Unison? A formal specification and reference implementation of a file synchronizer. Technical Report MS-CIS-03-36, University of Pennsylvania, Philadelphia, PA, USA (February 2004), http://www.cis.upenn.edu/~bcpierce/papers/unisonspec.pdf

  5. Xing, Z., Stroulia, E.: UMLDiff: an algorithm for object-oriented design differencing. In: ASE 2005: 20th IEEE/ACM Internat. Conf. on Automated Software Engineering, pp. 54–65. ACM, New York (November 2005)

    Google Scholar 

  6. Cicchetti, A., Ruscio, D.D., Pierantonio, A.: Managing model conflicts in distributed development. In: Busch, C., Ober, I., Bruel, J.-M., Uhl, A., Völter, M. (eds.) MODELS 2008. LNCS, vol. 5301, pp. 311–325. Springer, Heidelberg (2008)

    Chapter  Google Scholar 

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

    Article  Google Scholar 

  8. Lippe, E., van Oosterom, N.: Operation-based merging. ACM SIGSOFT Softw. Eng. Notes 17(5), 78–87 (1992)

    Article  Google Scholar 

  9. Saito, Y., Shapiro, M.: Replication: Optimistic approaches. Technical Report HPL-2002-33, Hewlett-Packard Laboratories (March 2002), http://www.hpl.hp.com/techreports/2002/HPL-2002-33.pdf

  10. Barrett, S., Chalin, P., Butler, G.: Decoupling operation-based merging from model change recording. In: ME 2010: Internat. Workshop on Models and Evolution (October 2010)

    Google Scholar 

  11. Cicchetti, A., Ruscio, D.D., Pierantonio, A.: A metamodel independent approach to difference representation. Journal of Object Technology 6(9), 165–185 (2007), http://www.jot.fm/contents/issue_2007_10/paper9.html

    Article  Google Scholar 

  12. Treude, C., Berlik, S., Wenzel, S., Kelter, U.: Difference computation of large models. In: ESEC-FSE 2007: 6th Joint Meeting of the European Software Engineering Conference and the ACM SIGSOFT Symposium on the Foundations of Software Engineering, pp. 295–304. ACM, New York (September 2007)

    Google Scholar 

  13. Barrett, S., Butler, G., Chalin, P.: Mirador: a synthesis of model matching strategies. In: IWMCP 2010: Internat. Workshop on Model Comparison in Practice (July 2010)

    Google Scholar 

  14. Pooch, U.W.: Translation of decision tables. ACM Comput. Surv. 6(2), 125–151 (1974)

    Article  Google Scholar 

  15. King, P.J.H.: Conversion of decision tables to computer programs by rule mask techniques. Commun. ACM 9(11), 796–801 (1966)

    Article  MATH  Google Scholar 

  16. Bendix, L., Koegel, M., Martin, A.: The case for batch merge of models issues and challenges. In: ME 2010: Internat. Workshop on Models and Evolution (October 2010)

    Google Scholar 

  17. Kermarrec, A.M., Rowstron, A., Shapiro, M., Druschel, P.: The IceCube approach to the reconciliation of divergent replicas. In: PODC 2001: 20th Annual ACM Sympos. on Principles of Distributed Computing, pp. 210–218. ACM, New York (August 2001)

    Google Scholar 

  18. Koegel, M., Helming, J., Seyboth, S.: Operation-based conflict detection and resolution. In: CVSM 2009: Workshop on Comparison and Versioning of Software Models, pp. 43–48. IEEE Computer Society, Los Alamitos (2009)

    Chapter  Google Scholar 

  19. Schmidt, M., Wenzel, S., Kehrer, T., Kelter, U.: History-based merging of models. In: CVSM 2009: Internat. Workshop on Comparison and Versioning of Software Models, pp. 13–18. IEEE Computer Society, Los Alamitos (May 2009)

    Chapter  Google Scholar 

  20. Pottinger, R.A., Bernstein, P.A.: Merging models based on given correspondences. In: VLDB 2003: 29th Internat. Conf. on Very Large Data Bases, VLDB Endowment, pp. 862–873 (September 2003)

    Google Scholar 

  21. Kolovos, D.S.: Establishing correspondences between models with the epsilon comparison language. In: Paige, R.F., Hartman, A., Rensink, A. (eds.) ECMDA-FA 2009. LNCS, vol. 5562, pp. 146–157. Springer, Heidelberg (2009)

    Chapter  Google Scholar 

  22. Schmidt, M., Gloetzner, T.: Constructing difference tools for models using the SiDiff framework. In: ICSE 2008: Companion of the 30th Internat. Conf. on Software Engineering, pp. 947–948. ACM, New York (May 2008)

    Google Scholar 

  23. Fleurey, F., Baudry, B., France, R., Ghosh, S.: A generic approach for automatic model composition. In: MoDELS 2007: 11th Internat. Workshop on Aspect-Oriented Modeling, Berlin, Germany, pp. 7–15. Springer, Heidelberg (September 2007)

    Google Scholar 

  24. Kolovos, D.S., Rose, L., Paige, R.F., Polack, F.A.: The Epsilon Book. Website of the Epsilon subproject of the Eclipse GMT project (2010), http://www.eclipse.org/gmt/epsilon/doc/book

  25. UML2. Website of the UML2 subproject of the Eclipse MDT project (May 2010), http://www.fujaba.de/home.html

Download references

Author information

Authors and Affiliations

Authors

Editor information

Editors and Affiliations

Rights and permissions

Reprints and permissions

Copyright information

© 2011 Springer-Verlag Berlin Heidelberg

About this paper

Cite this paper

Barrett, S.C., Chalin, P., Butler, G. (2011). Table-Driven Detection and Resolution of Operation-Based Merge Conflicts with Mirador. In: France, R.B., Kuester, J.M., Bordbar, B., Paige, R.F. (eds) Modelling Foundations and Applications. ECMFA 2011. Lecture Notes in Computer Science, vol 6698. Springer, Berlin, Heidelberg. https://doi.org/10.1007/978-3-642-21470-7_23

Download citation

  • DOI: https://doi.org/10.1007/978-3-642-21470-7_23

  • Publisher Name: Springer, Berlin, Heidelberg

  • Print ISBN: 978-3-642-21469-1

  • Online ISBN: 978-3-642-21470-7

  • eBook Packages: Computer ScienceComputer Science (R0)

Publish with us

Policies and ethics