On Mon, Feb 22, 2010 at 10:49:15AM +0000, David Aldrich wrote: > Hi Stefan > > > I've added a new section to the book explaining how to keep > > a branch alive after reintegration. > > Thanks very much for adding this new section. This method may well be > useful to us. Currently, we are running svn client 1.6.9 against svn > server 1.5.2. Will this combination support the "svn merge > --record-only" method that you described?
Sure, I don't see why not. Note however that merge-tracking related fixes have been made during virtually every release in both the 1.5.x and 1.6.x lines, so you may want to upgrade anyway. Also, 1.5.2 has a known security issue which was fixed in 1.5.7. Stefan