On May 1, 2006, at 7:43 PM, Paul Brook wrote:
What exactly are you trying to achieve?
The first order operation is is a new fangled concept called a
merge. The second order operation is to dig out from under svn bugs
with additional commands to get the state of the working copy
correct, so that when I do my ci, the repo will then have what I want
in it, aka, the merge product.
Why not just copy the file (with normal cp, for an existing
checkout) then svn
add it.
Well, conceptually, I want the history for the file, hence the cp. I
was trying to get around yet another svn bug that causes checkins of
merge products to fail.
In cvs, this just works. :-(^2.
I find that hard to believe. cvs doesn't even have the concept of a
copy.
Trust me, merging works in cvs, I've used it before.
It amazes me that svn can't do a merge.
