Fine-grained revision control for collaborative software development

ABSTRACT

This paper presents a framework for controlling the evolution of complex software systems concurrently developed by teams of software engineers. A general technique for fine-grained revision control of hierarchically structured information, such as programs and documents, is described and evaluated. All levels in the hierarchy are revision controlled, leaves as well as branch nodes. The technique supports sharing of unchanged nodes among revisions, automatic change propagation, and change-oriented representation of differences. Its use in a software development environment is presented, facilitating optimistic check-out of revisions and alternatives, check-in with incremental merge support, visualization of change propagation, and an integrated flexible diff-ing technique providing group awareness for team members.

REFERENCES

• EGR91: Clarence A. Ellis , Simon J. Gibbs , Gail Rein, Groupware: some issues and experiences, Communications of the ACM, v.34 n.1, p.39-58, Jan. 1991 [doi>10.1145/99977.99987]
• FM87: Christipher W. Fraser , Eugene W. Myers, An editor for revision control, ACM Transactions on Programming Languages and Systems (TOPLAS), v.9 n.2, p.277-295, April 1987 [doi>10.1145/22719.22948]
• Gus90: Gustavsso A., Software Configuration Management in an Integrated Environment, Llcentiate thesis, Dept. of Computer Science, Lund University, Lund, 1990.
• HM88: G. Hedin , B. Magnusson, The Mjo:.KC#/lner environment: direct interaction with abstractions, on ECOOP '88 (European Conference on Object-Oriented Programming), p.41-54, August 1988, Oslo, Norway
• HPR89: Susan Horwitz , Jan Prins , Thomas Reps, Integrating noninterfering versions of programs, ACM Transactions on Programming Languages and Systems (TOPLAS), v.11 n.3, p.345-387, July 1989 [doi>10.1145/65979.65980]
• Kan93: Kannegaard, J., The nineties are an exciting time for software developmen Keynote address at TOOLS Europe'93, Versailles, March, 1993.
• Kat90: Randy H. Katz, Toward a unified framework for version modeling in engineering databases, ACM Computing Surveys (CSUR), v.22 n.4, p.375-409, Dec. 1990 [doi>10.1145/98163.98172]
• KLMM93: Jorgen Lindskov Knudsen , Boris Magnusson , Mats Lofgren , Ole L. Madsen, Object Oriented Software Development Environments: The Mjolner Approach, Prentice-Hall, Inc., Upper Saddle River, NJ, 1994
• KP90: Michael J. Knister , Atul Prakash, DistEdit: a distributed toolkit for supporting multiple group editors, Proceedings of the 1990 ACM conference on Computer-supported cooperative work, p.343-355, October 07-10, 1990, Los Angeles, California, United States [doi>10.1145/99332.99366]
• LCM85: Leblang, D,B., Chase, Jr., R. P., McLean, Jr., G.D., The DOMATN Software Engineering Environment for Large Scale Software Development Efforts. Proceedings of the Ist International Conference on Computer Workstations. IEEE, November 1985.
• LCD+89: A. Lie , R. Conradi , T. M. Didriksen , E.-A. Karlsson, Change oriented versioning in a software engineering database, ACM SIGSOFT Software Engineering Notes, v.14 n.7, p.56-65, Nov. 1989
• LO92: Ernst Lippe , Norbert van Oosterom, Operation-based merging, ACM SIGSOFT Software Engineering Notes, v.17 n.5, p.78-87, Dec. 1992
• MM93: Minor, S., Magnusson, B., A Model for Semia)Syncbronous Collaborative Editing, Proceedings of ECSCW'93, Third European Co@erence on Computer Supported Cooperative Work Milano, Kluwer Academic Publishers, 1993.
• MMH90: Magnusson, B., Min&, S., Hedin, G., et al., An Overview of the Mj@lner Orm Environment Proceedings of the 2nd International Conference TOOLS (Technology of Object-Oriented Languages and System), Paris, 1990.
• MO92: McGuffin, L.J., Olson, G.M., ShrEdin A Shared Electronic Workspace, Cognitive Science and Machine Intelligence Laboratory, Tech. report #45, University of Michigan, Ann Arbor, 1992.
• MSC+86: James H. Morris , Mahadev Satyanarayanan , Michael H. Conner , John H. Howard , David S. Rosenthal , F. Donelson Smith, Andrew: a distributed personal computing environment, Communications of the ACM, v.29 n.3, p.184-201, March 1986 [doi>10.1145/5666.5671]
• NCK+92: Christine M. Neuwirth , Ravinder Chandhok , David S. Kaufer , Paul Erion , James Morris , Dale Miller, Flexible Diff-ing in a collaborative writing system, Proceedings of the 1992 ACM conference on Computer-supported cooperative work, p.147-154, November 01-04, 1992, Toronto, Ontario, Canada [doi>10.1145/143457.143473]
• NSE: Sun Micro Systems. Introduction to NSE.
• Roe75: Roekind, M.J., The source code control system. IEEE Transactions on Software Engineering, SE-1(4):364-370, December 1975.
• San85: Sandberg, R., The Design and Implementation of the Sun Network File System. Proceedings Usenix, June 1985.
• Teamware: Teamwae Users' Guide, SunPro Manual set. Sun Micro Systems, Mountain View, To appear.
• Tic85: Walter F. Tichy, RCS—a system for version control, Software—Practice & Experience, v.15 n.7, p.637-654, July 1985 [doi>10.1002/spe.4380150703]
• Tic88: Tlchy, W.F., Tools for Software Configuration Msnagement Proceedings of the International Workshop on Software Version and Configuration Control, Grassau, Germany, 1988.

INDEX TERMS

Primary Classification:
  K. Computing Milieux
  K.6 MANAGEMENT OF COMPUTING AND INFORMATION SYSTEMS
      K.6.3 Software Management
          Subjects: Software development

Additional Classification:
  D. Software
  D.2 SOFTWARE ENGINEERING
      D.2.7 Distribution, Maintenance, and Enhancement
          Subjects: Version control
      D.2.9 Management
          Subjects: Programming teams

General Terms:
Design, Management, Performance, Theory

Keywords:
CSCW, group awareness, incremental merge, software development, teamware, version and configuration control