Edgewall Software
Modify

Opened 15 years ago

Closed 15 years ago

#670 closed defect (fixed)

diff view in the changeset view seems to be broken in the trunk

Reported by: saspicer at mac dot com Owned by: Jonas Borgström
Priority: normal Milestone: 0.8
Component: version control/changeset view Version: devel
Severity: normal Keywords:
Cc: saspicer@… Branch:
Release Notes:
API Changes:

Description

Just pulled down the trunk and found that diffing seems to be broken in the trunk, I can download the diff, but I can't view it side-by-side…any thoughts ?

Also is there an easy way to un-install the latest version of trac (to back-date to 0.7.1 ?

Attachments (2)

trac_bug.pdf (28.1 KB ) - added by saspicer at mac dot com 15 years ago.
Screenshot of trac bug
diff_patch_ticket_670 (531 bytes ) - added by saspicer at mac dot com 15 years ago.
patch that closes ticket

Download all attachments as: .zip

Change History (16)

comment:1 by saspicer at mac dot com, 15 years ago

Component: generalchangeset view

I should add that I'm using the following:

Subversion 1.0.6 Python 2.2 trac trunk

comment:2 by saspicer at mac dot com, 15 years ago

Summary: diff view in the changeset view seems to be broken in the trunkAlso tested and failed with Python 2.3

Also tested, and failed with Python 2.3…

comment:3 by anonymous, 15 years ago

Summary: Also tested and failed with Python 2.3diff view in the changeset view seems to be broken in the trunk

comment:4 by saspicer at mac dot com, 15 years ago

Cc: saspicer@… added
Milestone: 0.8

Add myself to cc list.

comment:5 by anonymous, 15 years ago

In trunk the diff is not side by side. The diff is now interleaved.

Instead you get linenumbers on the left for the 2 different files. One file changes is in red and the other is in green.

Not sure if this is what you experience. If not reopen the ticket.

But check for example [805] and if this looks the same for your installation it is how it should look like now. There might be an option in trac.ini to change the layout.

The downloadable diff seems to be in patch format.

comment:6 by anonymous, 15 years ago

Resolution: invalid
Status: newclosed

comment:7 by saspicer at mac dot com, 15 years ago

Resolution: invalid
Status: closedreopened

Actually, I am unable to see *any* diff view, the formatting ends with the boxes "Unmodified

Added

Removed

Modified "

Not even the name of the file is presented. This is under Internet Explorer, Safari, and FireFox. The trac server is a RedHat Enterprise Workstation 3, Update 2 box. I've looked through the code, and I'm really at a loss as to why things don't work…what's the best method for debuging the setup ?

comment:8 by saspicer at mac dot com, 15 years ago

I have a screenshot if you email me…sean

comment:9 by anonymous, 15 years ago

Resolution: invalid
Status: reopenedclosed

Sean

do you see the diff on the project site? If so it is a problem on your side and this ticket is invalid.

I had the same problem, but it was due to the installation when I upgraded. I dont remember exactly why I had problems.

But make sure that you put the right env variables in you apache conf files.

I use trac on suse9.0 and see the diff with both IE, FireFox.

Ask on the mailinglist.

comment:10 by Jonas Borgström, 15 years ago

Resolution: invalid
Status: closedreopened

Please do not resolve tickets as anonymous…

comment:11 by saspicer at mac dot com, 15 years ago

I can see the diff on the project site…I did the install from scratch, not an upgrade. I'm really trying to understand what could be wrong, here are the environment variables:

# Trac need to know where the database is located <Location "/cgi-bin/trac.cgi">

SetEnv TRAC_ENV "/trac/gp SetEnv LD_LIBRARY_PATH "/usr/lib:/usr/local/lib" SetEnv PYTHONPATH "/usr/local/lib/svn-python"

</Location>

comment:12 by anonymous, 15 years ago

I think my problem went away when I started to use the trunk version.

Check-out the trunk version and try with that. That is what they use on the trac project page.

comment:13 by saspicer at mac dot com, 15 years ago

If you read the initial ticket, the trunk is the version I'm operating with… —sean

by saspicer at mac dot com, 15 years ago

Attachment: trac_bug.pdf added

Screenshot of trac bug

by saspicer at mac dot com, 15 years ago

Attachment: diff_patch_ticket_670 added

patch that closes ticket

comment:14 by Jonas Borgström, 15 years ago

Resolution: fixed
Status: reopenedclosed

Sean, trunk now correctly uses -U num instead of -u num so it should now work with diffutils ≥ 2.8.1 as well. Good catch.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Jonas Borgström.
The resolution will be deleted. Next status will be 'reopened'.
to as closed The owner will be changed from Jonas Borgström to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.