elego Software Solutions at SubConf 2008
Title of the presentation: Tree conflict handling in Subversion 1.6 and beyond
Category: Powertrack
Level: Advanced
Date and Time: Thursday, 16th October 2008, 03:00 p.m. - 03:45 p.m.
Abstract: Subversion remembers structural changes such as deletes, moves, and renames of objects (files or directories). However, in the presence of combined structural and textual modifications, operations tend to fail or lose information on the handled objects in working copies. These tree conflicts arise when concurrent modifications in the working copy and the repository have been made that are not easily reconciled.
Examples:
- Update pulls down text modifications to a locally moved file
- Update pulls down a move of a locally modified file.
- Changes to renamed files do not follow the file's new location
- Merge tries to apply changes to a moved file
The current user experience in the detection and resolving of tree conflicts is suboptimal and will be addressed in Subversion 1.6.
This presentation explains some very common use cases that cause serious problems for teams working in parallel.
Stephen Butler has worked for software companies in the USA and Europe, mainly in the telecom industry, with a personal focus on software process improvements.
In 2007 he joined elego Software Solutions as a Senior Developer and CM Consultant. At UBS in Switzerland, he worked on a large migration project from CM Synergy to Subversion. He has achieved partial committer status in the Subversion project for his tree-conflict contributions.
Stefan Sperling studied computer science at Free University of Berlin. He has been working with elego as a trainee student for many years. Since the beginning of 2007 he has been contributing to the Subversion project and became a full committer for the project in early 2008. Stefan has gained familiarity with Subversion’s working copy library and other areas while working on Subversion’s tree-conflict branch, together with Stephen Butler and Julian Foad from CollabNet.
