My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 892: Can't ignore whitespace when showing intraline differences
18 people starred this issue and may be notified of changes. Back to list
Status:  Accepted
Owner:  ----


Sign in to add a comment
 
Reported by higeo...@gmail.com, Mar 30, 2011
Affected Version:
2.1.6.1

What steps will reproduce the problem?
In a file diff select "Ignore Whitespace: All" and check "Intraline Differences"

What is the expected output? What do you see instead?
I expect that lines that only have whitespace differences are not shown, and lines that have textual differences have the differences marked.
Instead the intraline differences are shown but also the whitespace differences. When having "Intraline Differences" checked there is no difference between "Ignore Whitespace: None" and "Ignore Whitespace: All" and any other "Ignore Whitespace" option.

Please provide any additional information below.
see http://groups.google.com/group/repo-discuss/browse_thread/thread/7aac6f8f809fce2c/f6c485358888c81b#f6c485358888c81b
Mar 30, 2011
#1 nas...@chromium.org
 Issue 893  has been merged into this issue.
May 20, 2011
Project Member #2 nas...@grainawi.org
(No comment was entered for this change.)
Status: Accepted
Nov 17, 2011
#3 mkr...@chromium.org
To add to this, I noticed this strange behavior in addition to the bug:

This works (i.e. intraline differences *disabled*):
1) Start with ignoring whitespace "None" and intraline differences checked.
2) Change ignoring whitespace to "All", uncheck intraline differences, and click "Update".
The whitespace is indeed not shown when intraline differences is disabled.

This does not work:
1) Start with ignoring whitespace "None" and intraline differences checked.
2) Change ignoring whitespace to "All" and click "Update". (This exhibits the bug identified by this issue.)
3) Uncheck intraline differences and click "Update".
This does not ignore whitespace even though the settings end up being the same as above.

I'm guessing there's some weird state related to the "Update" button and "intraline differences", because it will work if you reload.

Note also that if you start out with the working case above, enabling intraline differences doesn't break whitespace but doesn't work either:
1) Start with ignoring whitespace "All" and intraline differences unchecked.
2) Check intraline differences and click "Update".
While this does ignore whitespace, it doesn't actually show intraline differences.  (And reloading goes back to the original broken behavior.)

Sign in to add a comment

Powered by Google Project Hosting