[boost] Re: Steps before moving to Subversion

From: David Abrahams (dave_at_[hidden])
Date: 2005-04-27 13:25:04

Rene Rivera <grafik.list_at_[hidden]> writes:

> David Abrahams wrote:
>> Rene Rivera <grafik.list_at_[hidden]> writes:
>> 
>>> My biggest concern is still the disfunctional merge operation of
>>> SVN. In my last contract job a few weeks ago I had it loose a set
>>> of changes during a merge :-(
>> Do you use svnmerge?
>
> No. I used "svn merge -r N:M -m "Something" somefile.php". Which is what 
> the svnbook says to use. It happened to generate a conflict because of 
> changes in the trunk (I was working on a branch). The conflict file it 
> generated lost a line. And I did not notice because I did not look at 
> the non-conflict files.

There's a script called svnmerge that handles this, if you just agree
to use that instead of svn's built-in merging.  Please see
http://lists.boost.org/boost/2005/02/19955.php

-- 
Dave Abrahams
Boost Consulting
www.boost-consulting.com