Heads up -- jdk 7 copyright year update

[Erik Trimble]

Indeed, I don't see any problem with any files that aren't changed by
those I'm pushing up.

However, filemerge generally requires that I at least _look_ at each
file before accepting the merges, and with a GUI, that can take 45
minutes or more (especially with larger pushes like this one, where I'm
going to be pushing 500 or so files).

Maybe I'll look at hgmerge to see if it can eliminate some my work.

-Erik


On Thu, 2008-10-02 at 16:42 -0700, Kelly O'Hair wrote:
> I kind of doubt this creates a major issue in merging, but I could be wrong.
> Files your team has not changed (e.g. non-hotspot files) won't be involved
> at all, and even the ones where there is a conflict should automatically
> resolve, by hgmerge or by filemerge, depending on the merge tool you are using.
> 
> I guess, what I'm saying is that if this kind of change does create a major
> effort on your part, I'd like to understand why so we can address it.
> 
> -kto
> 
> 
> Erik Trimble wrote:
> > Any chance whatsoever you can wait until AFTER I do this week's Hotspot
> > integration (probably Tuesday morning)?  Otherwise, I end up with a huge
> > amount of conflict resolutions I have to do...
> > 
> > 
> > On Thu, 2008-10-02 at 16:14 -0700, Xiomara.Jayasena at Sun.COM wrote:
> >> Hi,
> >>
> >> I plan to be updating about 500 files with copyright year update to 
> >> 2008.   I hope to be able to put this back to the master repositories 
> >> tomorrow.
> >>
> >> -Xiomara
> >>
> >>
-- 
Erik Trimble
Java System Support
Mailstop:  usca22-123
Phone:  x17195
Santa Clara, CA
Timezone: US/Pacific (GMT-0800)