Mea culpa. I had several changes to the ClusterDumper SVD tests in
limbo when you committed your changes. I thought I'd caught all your
changes in the merge but evidently missed some. I'd be happy to work out
some sort of 'hands off' mechanism to reduce this in the future because,
I agree, its inefficient and annoying. I think that most people work in
one pretty vertical section of the code base at a time and thus do not
usually compete. Its the horizontal work like the thankless job (BTW,
thank you) of removing checkstyle warnings, migrating all the unit tests
to Junit 4, and so forth that touch large sections of the code which
likely cause most of the merge issues.
On 9/15/10 2:29 AM, Sean Owen wrote:
I noticed that some of my last changes to TestClusterDumper, for
example, were reversed in a subsequent change. I don't mind, they were
largely cosmetic, to fix little checkstyle warnings. Not sure if that
was on purpose or an accidental artifact of the merge. But I wonder if
people are finding it hard to merge such changes and if so are people
comfortable asking to keep 'hands off' certain sections for a limited
time when it's actively being worked on? (We should be able to do
this, informally, without resorting to locking or anything.)
