On Tue, Jan 01, 2008 at 06:59:21PM -0700, Scott Long wrote: > David E. O'Brien wrote: >> obrien 2008-01-02 01:45:31 UTC >> FreeBSD src repository >> Modified files: >> sys/cam cam_xpt.c Log: >> style(9) >> Revision Changes Path >> 1.193 +73 -73 src/sys/cam/cam_xpt.c > > Thanks for making CAM merges harder now than they were before.
Have you done a 'cvs update' in your sources to see if they actually conflict? SURELY it is not beyond you to <ESC>:%s/[<TAB><SP>]*$//g in vi? (I'm sure Emacs can do do this just as easily, if you're that kind of guy). > A normal, well adjusted team player Thank you for the personal attack - I guess I get the prize for the first attack from you of the new year. > would have asked the person/people working in this area if it was ok to > do something like this. Lets see - this file had 5 commits in the past 6 months. You you did the last one. It was revision 1.192 on 2007/12/16 - a one line addition. The previous commit you made was revision 1.189 on 2007/06/17 - a change of +3 -2. So that does not indicate you're in the middle of some major maintenance here. Between those two commits were two other changes - one by julian and one by imp. The commit before your 1.189 was a one liner by dwmalone. Neither of these commits had "Approved by: scottl" on them. I wonder if you complained to them about committing without running it by you first. > What a circus. I await your indignant rules lawyering. Personally I think you're just bitching at me for the F of it - due to some personal need to boost yourself and put down others... -- -- David ([EMAIL PROTECTED]) _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "[EMAIL PROTECTED]"
