Rene Rivera <grafik.list@redshift-software.com> writes:
Rene Rivera wrote:
But since you mention the svnmerge script, here's some questions.. Is there a way to use that script from one of the svn GUI clients? Is there a way to prevent the use of "svn merge"? Basically, what's to prevent users, other than convention, from messing up?
Never mind.. just found the documentation of svnmerge. And hence have some answers.
What are they, please? I don't know them.
But here's the thing, it solves the book keeping aspect of the svn merge. But it doesn't solve the problem I had. It's not like I did not follow the procedure of marking the comments with merge points and using "-r N:M" to only merge the un-merged changes. My problem was that the svn merge operation lost a line, literally. Which means that the conflict resolution algorithm has a problem. So unless there's a solution out there that doesn't use "svn merge" we might get bitten.
Oh. Well it's not nice to have a bug, but you have to check your merge results by hand anyway, don't you? -- Dave Abrahams Boost Consulting www.boost-consulting.com