Rene Rivera wrote:
Schrom, Brian T wrote:
Do you have a test case that we can reproduce your missing line merge and post back to Subversion?
I wish I did! But I don't even have access to the machine that I was given access to for the development of the project. And I can't even think of the task of trying to reproduce it independently. It would just take a long time. I should point out that it was only one merge that went wrong. All the other, >20, <50, merges had no problems.
I would say we should not spend too much time discussing a single problem of out of 50 merges you run into. If this is a bug, it might be fixed already. If it's not fixed, then any regression testing will catch the problem. And it might not be a bug at all. I once had svn perform completely bogus merge (on "svn up", not "svn merge"). And in the end in turned out I just had run very outdated "svn" on a working copy created by the current one. Just user error.
Perhaps some industrious Booster can figure out an automated merge test we could run ;-) -- For that matter do the SVN developers have such a thing?
They do have a lot of tests, and merge operation is surely tested. - Volodya