Subversion 1.6 and Tree Conflicts

The fine folks from subversion.tigris.org have bequeathed to the world Subversion 1.6. Grab the source from Tigris or download one of the certified binaries from CollabNet. Subversion 1.6 introduces several new features, including improved authentication and filesystem storage as well as better handling of tree conflicts. Read the full release notes.

• Register for the What's New in Subversion 1.6 webcast
• Download certified binaries for CollabNet Subversion 1.6

Subversion 1.6 and Tree Conflicts

Most Subversion users are familiar with text conflicts. The classic case: You have a locally edited file in your working copy, an "svn update" brings a change to the same file from the repository, that incoming change cannot be merged cleanly into your local change, and the result is a text conflict. Subversion 1.6.0 expands this concept to cover conflicts at the directory level, e.g. you locally delete a file then an update tries to bring a text change down on that file. These new types of conflicts are called tree conflicts.

• Read the full blog post