2008-07-19 06:59:30 |
Alexander Belchenko |
bug |
|
|
added bug |
2008-07-19 06:59:30 |
Alexander Belchenko |
bug |
|
|
added attachment 'qdiff-sbs-vertical-no-align.png' (qdiff-sbs-vertical-no-align.png) |
2008-07-19 07:00:02 |
Alexander Belchenko |
qbzr: milestone |
|
0.9.2 |
|
2008-07-19 07:40:23 |
Alexander Belchenko |
description |
Sometimes side-by-side diff is not alighned properly. This is very easy to see because horizontal line under file name and properties is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
bzr merge --qpreview ../trunk |
Sometimes side-by-side diff is not alighned properly. This is very easy to see because horizontal line under file name and properties is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
bzr merge -r297 --qpreview ../trunk |
|
2008-07-20 12:19:05 |
Gary van der Merwe |
qbzr: status |
New |
Incomplete |
|
2008-07-20 13:27:18 |
Alexander Belchenko |
bug |
|
|
added attachment 'sbs-no-trailing-newline.zip' (simple example of 2 branches to reproduce bug) |
2008-07-20 13:28:59 |
Alexander Belchenko |
bug |
|
|
added attachment 'sbs-no-trailing-newline.png' (sbs-no-trailing-newline.png) |
2008-07-20 13:32:08 |
Alexander Belchenko |
description |
Sometimes side-by-side diff is not alighned properly. This is very easy to see because horizontal line under file name and properties is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
bzr merge -r297 --qpreview ../trunk |
Sometimes side-by-side diff is not aligned properly because content on one of the side has no trailing newline. This is very easy to see because horizontal line under file name and properties of next file is not on the same level.
Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:
bzr merge -r297 --qpreview ../trunk
See below simple test case with 2 branches. |
|
2008-07-20 13:32:08 |
Alexander Belchenko |
title |
qdiff side-by-side is not aligned properly |
qdiff side-by-side is not aligned properly when there is no newline at one side |
|
2008-07-20 14:03:50 |
Alexander Belchenko |
qbzr: status |
Incomplete |
Triaged |
|
2008-07-20 14:03:50 |
Alexander Belchenko |
qbzr: importance |
Undecided |
High |
|
2008-07-20 15:38:04 |
Alexander Belchenko |
qbzr: status |
Triaged |
In Progress |
|
2008-07-20 15:38:04 |
Alexander Belchenko |
qbzr: assignee |
|
bialix |
|
2008-07-20 16:05:23 |
Alexander Belchenko |
qbzr: status |
In Progress |
Fix Committed |
|
2008-07-22 09:23:48 |
Alexander Belchenko |
qbzr: status |
Fix Committed |
Fix Released |
|