qdiff marks the wrong lines when line ending style changes
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| QBzr |
Confirmed
|
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-
Bazaar (bzr) 2.3.0
Python interpreter: C:\Program Files\Bazaar\
Python standard library: C:\Program Files\Bazaar\
Platform: Windows-
bzrlib: C:\Program Files\Bazaar\
Bazaar configuration: C:\Documents and Settings\
Bazaar log file: D:\UserData\
Copyright 2005-2010 Canonical Ltd.
http://
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.
| Bernhard Voelker (mail-bernhard-voelker) wrote | #1 |
| tags: | added: qdiff |
| Alexander Belchenko (bialix) wrote | #2 |
| Changed in qbzr: | |
| status: | New → Confirmed |
| importance: | Undecided → Medium |
| tags: | added: line-endings |
| Alexander Belchenko (bialix) wrote | #3 |
It seems our unidiff view can show the right thing, and only side-by-side view is affected.