RE: [boost] Re: Steps before moving to Subversion
Do you have a test case that we can reproduce your missing line merge and post back to Subversion? -----Original Message----- From: boost-bounces@lists.boost.org [mailto:boost-bounces@lists.boost.org] On Behalf Of Rene Rivera Sent: Thursday, April 28, 2005 7:32 AM To: boost@lists.boost.org Subject: [boost] Re: Steps before moving to Subversion David Abrahams wrote:
Rene Rivera <grafik.list@redshift-software.com> writes:
Never mind.. just found the documentation of svnmerge. And hence have some answers.
What are they, please? I don't know them.
http://www.dellroad.org/svnmerge/index
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?
Of course you should check the merge results.. And I did in this case. But what I did was open the source file, which has the usual "<<<" and ">>>" conflict markers, and edit to make sure all the changes where in there. But that conflict result was missing a line. When I did a diff from what I had to the repository version on my branch, the other check I go through when merging, the missing line obviously didn't show either. What I failed to do was do a manual diff between the two other original source files, the head revision and the branch revision, which svn creates when it finds a conflict. I don't consider what I did as unusual, as I was expecting the conflict resolution of a merge to *never* loose information, under any circumstances. -- -- 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 _______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
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. 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? -- -- 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
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
participants (3)
-
Rene Rivera -
Schrom, Brian T -
Vladimir Prus