Ok, so how about this (I admit that I'm guilty of removing trailing
blanks from some files that I work on and sneak these changes in):
I keep my fingers still until we have all the code changes in and call
it RC1. Afterwards we do one big rush to clean up these issues like
trailing blanks and missing javadocs. So we get all these cosmetic
changes isolated in one go.
Best regards
Henning
On Mon, 2005-09-26 at 22:29 -0700, Daniel Rall wrote:
> On Sat, 24 Sep 2005, Henning P. Schmiedehausen wrote:
>
> > "Daniel L. Rall" <[email protected]> writes:
> >
> > >On Thu, 22 Sep 2005, [EMAIL PROTECTED] wrote:
> >
> > >> Author: henning
> > >> Date: Thu Sep 22 06:32:34 2005
> > >> New Revision: 290942
> > >>
> > >> URL: http://svn.apache.org/viewcvs?rev=290942&view=rev
> > >> Log:
> > >> - Clean up imports using Eclipse
> > >> - Remove trailing blanks
> >
> > >This type of "clean-up" makes merging changes in my working copy or from
> > >patches and tracking changes between revisions extremely difficult. I'd
> > >appreciate it if this type of change was avoided in the future. :-)
> >
> > Cleaning up imports is IMHO a good thing.
> >
> > The question about the blanks is IMHO open for discussion. If we want
> > to have useful output from code linters like PMD or Checkstyle then we
> > must at some point reduce the number of errors stemming from things
> > like this. I will apply more caution in the future, though.
>
> Actually, doing it all at once instead of piece-meal is preferable, as it
> reduces the necessary number of merges and code churn which. I'm watching
> a lot of commits along these lines slide by, and while a single change is
> more work to read, its more managable from a releng perspective.
>
> > What was/is the problem with your working copy?
>
> Merge conflicts in multiple working copies. But I'm familiar with those
> changes (or at least once was ;-)...the patches sitting in the issue tracker
> are another story.
>
> - Dan
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
[EMAIL PROTECTED] +49 9131 50 654 0 http://www.intermeta.de/
RedHat Certified Engineer -- Jakarta Turbine Development
Linux, Java, perl, Solaris -- Consulting, Training, Engineering
4 - 8 - 15 - 16 - 23 - 42
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
