qdiff marks the wrong lines when line ending style changes

Bug #728364 reported by Bernhard Voelker on 2011-03-03
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
QBzr
Medium
Unassigned

Bug Description

`bzr qdi` marks the wrong lines as changed when the line ending changes
from DOS style to 0D0D0A in between a file. `bzr di` is still right.

Attached are the 2 revisions of a .js file plus a screenshot of qdiff.

D:\bzr-diff-lost>bzr --version
Bazaar (bzr) 2.3.0
  Python interpreter: C:\Program Files\Bazaar\python26.dll 2.6.6
  Python standard library: C:\Program Files\Bazaar\lib\library.zip
  Platform: Windows-XP-5.1.2600-SP3
  bzrlib: C:\Program Files\Bazaar\lib\library.zip\bzrlib
  Bazaar configuration: C:\Documents and Settings\vb027591\Application Data\bazaar\2.0
  Bazaar log file: D:\UserData\vb027591\My Documents\.bzr.log

Copyright 2005-2010 Canonical Ltd.
http://bazaar.canonical.com/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

Bazaar is part of the GNU Project to produce a free operating system.

tags: added: qdiff
Alexander Belchenko (bialix) wrote :

It seems our unidiff view can show the right thing, and only side-by-side view is affected.

Changed in qbzr:
status: New → Confirmed
importance: Undecided → Medium
tags: added: line-endings
Alexander Belchenko (bialix) wrote :

Attached branch with files provided by bug reporter, committed as r1 and r2 for easy testing.

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers