Bug 980695 - Diff is highlighting changes in wrong order
Summary: Diff is highlighting changes in wrong order
Keywords:
Status: CLOSED CURRENTRELEASE
Alias: None
Product: PressGang CCMS
Classification: Community
Component: Web-UI
Version: 1.1
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
: ---
Assignee: Matthew Casperson
QA Contact: Lucas Costi
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2013-07-03 04:09 UTC by Lucas Costi
Modified: 2014-08-04 22:27 UTC (History)
3 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2013-09-09 00:00:36 UTC


Attachments (Terms of Use)

Description Lucas Costi 2013-07-03 04:09:58 UTC
Description of problem:

The diff tool systems to be doing the change highlighting in the wrong order.

The order of the revisions displayed on-screen for left/right is correct (i.e. the newer revision is on the left), but the change highlighting seems to show the revision on the left as being the superseded one.

i.e. something added to the newer revision (displayed on the left), is shown in red with a strikethrough, and something that was replaced in the older revision (displayed on the right), is shown with a bluey background.

The highlighting probably should be the other way around?

Bug is  present in the Next-UI Build 201307011553

Comment 1 Lucas Costi 2013-07-03 04:17:22 UTC
arrg, the first sentence in the description was supposed to be:
"The diff tool seems to be doing the change highlighting in the wrong order."

Comment 2 Matthew Casperson 2013-07-09 06:16:50 UTC
Fixed in 201307091606

Diff order is reversed, so the colours make more sense.

NOTE:
When QAing bug fixes, please make sure the build you are using is equal to or higher than the build identified above. Be aware that this fix may have only been applied in PressGang Next at this time, or it may not be currently applied in any production system, in which case it can only be verified at a later date.

Comment 4 Lucas Costi 2013-07-29 23:00:45 UTC
Verified that it is working now, although the sides of the displayed revisions have now changed (i.e. the older revision is now on the left, and the newer revision is now on the right).

As this it looks like this is the intended usage of mergely, It might be worth mentioning this change in the release notes.

Comment 5 Lee Newson 2013-08-02 05:45:14 UTC
Thanks Lucas.

I believe what we probably should do is look at adding headers to the diff view so that it will display the revision number, as that would make things a lot clearer. As such I've created BZ#991295 to deal with that.


Note You need to log in before you can comment on or make changes to this bug.