ok, tired of getting tripped by this... The editors I use aren''t fussy about trailing white space on lines - esp. in comments, there are often 1 or 2 trailing blanks on lines in files I''ve worked on. Conversely whatever you''re using aggressively strips line-ending white space on any file you touch. This totally destroys ability to do reasonable change compares between versions, which I rely on utterly. I can''t identify relevant changes when 90% of the compare delta is blank-stripping. This is bad. We need some approach so we both commit with consistent formatting. Some combo of text editor settings or a formatter we both like, dunno what''s going to be best, but let''s see if we can find solution. thx ~ Deb
I was wondering what was going on here. I had to remove some white space in the one test file so that it matched. Have you ever used "beyond compare"? We use it on windows and it does a fabulous job. It shows you side by side the changes and color codes the chars in a line that changed. You can have it ignore whitespace etc. It will do files, and directories of files. It is just a wonderful comparison and merge tool. Not that this is what we need to do here, just mentioning it to you since it saves me tons of time diffing and merging in my java projects for work. So on every file I touch, you are seeing white space changes on the whole file? I''m sure I can turn this off in emacs now that I know it is happening. Let me check into it. Jeff On 1/28/07, Deb Lewis <djlewis at acm.org> wrote:> > ok, tired of getting tripped by this... > > The editors I use aren''t fussy about trailing white space on lines - esp. > in > comments, there are often 1 or 2 trailing blanks on lines in files I''ve > worked on. Conversely whatever you''re using aggressively strips > line-ending > white space on any file you touch. > > This totally destroys ability to do reasonable change compares between > versions, which I rely on utterly. I can''t identify relevant changes when > 90% of the compare delta is blank-stripping. This is bad. > > We need some approach so we both commit with consistent formatting. Some > combo of text editor settings or a formatter we both like, dunno what''s > going to be best, but let''s see if we can find solution. thx > > ~ Deb > > _______________________________________________ > Masterview-devel mailing list > Masterview-devel at rubyforge.org > http://rubyforge.org/mailman/listinfo/masterview-devel >-- Jeff Barczewski, MasterView core team Inspired Horizons Ruby on Rails Training and Consultancy Next Ruby on Rails plus JRuby workshop Feb 22-24 St. Louis, MO http://inspiredhorizons.com/training/rails/index.html Limited seating, register now! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://rubyforge.org/pipermail/masterview-devel/attachments/20070129/ef14dd58/attachment.html
Are we sure it is actually stripping white space or possibly changing new line chars? Like instead of \r\n it is saving just \n? This might also show up as all lines changed. On 1/29/07, Jeff Barczewski <jeff.barczewski at gmail.com> wrote:> > I was wondering what was going on here. > > I had to remove some white space in the one test file so that it matched. > > Have you ever used "beyond compare"? We use it on windows and it does a > fabulous job. It shows you side by side the changes and color codes the > chars in a line that changed. You can have it ignore whitespace etc. It will > do files, and directories of files. > > It is just a wonderful comparison and merge tool. > > Not that this is what we need to do here, just mentioning it to you since > it saves me tons of time diffing and merging in my java projects for work. > > So on every file I touch, you are seeing white space changes on the whole > file? I''m sure I can turn this off in emacs now that I know it is happening. > Let me check into it. > > Jeff > > > > On 1/28/07, Deb Lewis <djlewis at acm.org> wrote: > > > > ok, tired of getting tripped by this... > > > > The editors I use aren''t fussy about trailing white space on lines - > > esp. in > > comments, there are often 1 or 2 trailing blanks on lines in files I''ve > > worked on. Conversely whatever you''re using aggressively strips > > line-ending > > white space on any file you touch. > > > > This totally destroys ability to do reasonable change compares between > > versions, which I rely on utterly. I can''t identify relevant changes > > when > > 90% of the compare delta is blank-stripping. This is bad. > > > > We need some approach so we both commit with consistent > > formatting. Some > > combo of text editor settings or a formatter we both like, dunno what''s > > going to be best, but let''s see if we can find solution. thx > > > > ~ Deb > > > > _______________________________________________ > > Masterview-devel mailing list > > Masterview-devel at rubyforge.org > > http://rubyforge.org/mailman/listinfo/masterview-devel > > > > > > -- > Jeff Barczewski, MasterView core team > Inspired Horizons Ruby on Rails Training and Consultancy > Next Ruby on Rails plus JRuby workshop Feb 22-24 St. Louis, MO > http://inspiredhorizons.com/training/rails/index.html > Limited seating, register now!-- Jeff Barczewski, MasterView core team Inspired Horizons Ruby on Rails Training and Consultancy Next Ruby on Rails plus JRuby workshop Feb 22-24 St. Louis, MO http://inspiredhorizons.com/training/rails/index.html Limited seating, register now! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://rubyforge.org/pipermail/masterview-devel/attachments/20070129/6c4253cb/attachment.html
For general use, I use a compare tool called UltraCompare, which is pretty good; I gave it try because I settled on UltraEdit for my Windows text editor (when not in eclipse, that is) after hunting around and trying several. It''s a really programmer editor, you can plug in syntax hightlight definitions so I''ve added ruby, python, etc to the stock set of basic rules it ships with. Believe UltraCompare has options for ignoring white space. But.. trouble is I''m running into this running sync tools for subclipse in Eclipse, and I dont'' think that''s very configurable. (I''ll re-check, though) I''ll check out your "beyond compare", always useful to know about good tools.>> you are seeing white space changes on the whole filebelieve so, at any rate I periodically get something with a ton of changes reported which are just a bunch of trailing-black strippers.>> maybe its newlinesI don''t think so, because even when I got a lot of hits it does seem to be selective, not *every* line in the file. But checking a couple random files we do seem to be inconsistent about svn:eol-style props - i find native, LF, and not set. Seems like that should be set to native on .rb files (and probably .html as well), then subversion generally just does the right thing at checkout time. ~ Deb -------------- next part -------------- An HTML attachment was scrubbed... URL: http://rubyforge.org/pipermail/masterview-devel/attachments/20070129/daf4c663/attachment.html
On 1/29/07, Deb Lewis <djlewis at acm.org> wrote:> > > But checking a couple random files we do seem to be inconsistent about > svn:eol-style props - i find native, LF, and not set. Seems like that > should be set to native on .rb files (and probably .html as well), then > subversion generally just does the right thing at checkout time. >So maybe if we get this straightened out, then that may fix our issues? I guess we can try to get that resolved how it needs to be and then see if it still occurs. Hard for me to get my head around this stuff, since I haven''t had to deal with it before and have pretty much only needed to know the basics to get by in svn so far. I''ll read up on the setting the props properly. Jeff -------------- next part -------------- An HTML attachment was scrubbed... URL: http://rubyforge.org/pipermail/masterview-devel/attachments/20070130/7f1f154b/attachment.html