David Abrahams wrote:
Rene Rivera <grafik.list@redshift-software.com> 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. -- -- Grafik - Don't Assume Anything -- Redshift Software, Inc. - http://redshift-software.com -- rrivera/acm.org - grafik/redshift-software.com -- 102708583/icq - grafikrobot/aim - Grafik/jabber.org