Building Subversion on Windows: A Walk-through

There are many reasons you might want to build Subversion yourself rather than use a binary distribution such as CollabNet’s certified Subversion Command Line Client or CollabNet Subversion Edge (available here http://www.open.collab.net/products/subversion/getit.html). One common reason is the need for a debug build to track down potential problems. Another is the desire to submit a patch [...]

Where Did That Mergeinfo Come From?

One area of merge tracking that has caused confusion is how svn:mergeinfo properties are set.  In many common use cases only mergeinfo on the merge target is set.  There are however, many scenarios where mergeinfo under the target, so called "subtree mergeinfo", is created or updated.  These situations often leave users wondering if something went wrong during [...]

Subversion 1.6.0 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 [...]

Subversion 1.5 Merge Tracking and Mergeinfo

Mergeinfo is simply the history of merges made into a path. But as with many things that can be described so simply, mergeinfo can become a bit more complex in practice. Read Paul’s Burba’s blog post and article and learn about the internals of Subversion’s merge tracking feature.

Subversion 1.5 Merge Tracking and Mergeinfo (Article)

This article assumes basic familiarity with the topics covered in chapter 4 of the Subversion book and/or some experience with Subversion 1.5; either the early adopter 1.5 binaries available on open.collab.net or one of the 1.5.0 release candidates.  The examples in this article were done with release candidate 4.  As of May 6, 2008 the most [...]