Comment 5 for bug 250027
Revision history for this message
| Alexander Belchenko (bialix) wrote Re: qdiff side-by-side is not aligned properly | #5 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
Gary, I managed to reproduce it with simple example (see attached zip with branches 1 and 2). To reproduce you need to run command
bzr merge --qpreview ../2
from branch 1.
I'm convinced we have several bugs related to diffing files that have no trailing new line in one (and only one) side. Moreover, adding newline in next revision is also produce odd diff. Run in 0.9.2 branch command:
bzr qdiff -c305
and examine last line of diff in SBS view.