Subversion 1.6 and Tree Conflicts

最新推荐文章于 2016-12-15 21:54:40 发布

最新推荐文章于 2016-12-15 21:54:40 发布 · 63 阅读

Subversion 1.6 已发布，带来了改进的身份验证和文件系统存储功能，以及更好地处理树冲突的能力。新版本引入了目录级别的冲突处理机制，即树冲突，以解决用户本地删除文件而更新时尝试覆盖的问题。

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.