QDiff decorates differences incorrectly under certain circumstances

[Craig Hewetson]

Delete line X, run qdiff and you will see that X-1 shows up as deleted. See screenshot.

[Craig Hewetson (craighewetson-deactivatedaccount)]

Same difference except I used p4merge via the external diff mechanism. You will notice that it is correct.

[Alexander Belchenko (bialix)]

Craig Hewetson пишет:
> Public bug reported:
>
> Delete line X, run qdiff and you will see that X-1 shows up as deleted.
> See screenshot.

Smells like the encodings problem, again.

Please check if your file has non-ascii characters inside.
Can you try to run
bzr qdiff --encoding latin-1
and see if it makes any difference?

[Gary van der Merwe (garyvdm)]

Please upload the file, or a file that reproduces the bug.

[Craig Hewetson (craighewetson-deactivatedaccount)]

Nope. See attachment.

Do you think it might be line endings? In p4merge I've set it to ignore line
ending differences.

[Craig Hewetson (craighewetson-deactivatedaccount)]

here goes, look, i had to remove content, but i left a few lines.
This file use to live in VSS and its encoding is ISO-8859-1.
I've also tested qdiff with this encoding.

[Gordon Tyler (doxxx)]

On 03/03/2010 12:27 PM, Craig Hewetson wrote:
> ** Attachment added: "XEngine.java"
> http://launchpadlibrarian.net/40094170/XEngine.java

Unless this is an artifact of your attachment or removal of content, the
last line ends in a CR but all the other lines end in CRLF. Would this
confuse qdiff?

[Craig Hewetson (craighewetson-deactivatedaccount)]

I wish i could give the original file... I'm sure it would make it easier.

But if i look at the original file in a hex editor at the end of each line I
get 0x0D 0x0A
When trying to reproduce this problem with a new file i can only get 0x0A at
the end of each line.

I think this file was originally create on Windows with line endings 0x0D
0x0A and all new files I've created since then on linux have line endings
0x0A.