qdiff marks the wrong lines when line ending style changes

Voelker, Bernhard bernhard.voelker at siemens-enterprise.com
Thu Mar 3 09:38:50 UTC 2011


Hi,

`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.

Is this one already known?

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.

Have a nice day,
Berny
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-qdiff-lost.zip
Type: application/x-zip-compressed
Size: 78532 bytes
Desc: bzr-qdiff-lost.zip
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20110303/ed406c90/attachment-0001.bin>


More information about the bazaar mailing list