Edgewall Software
Modify

Opened 10 years ago

Last modified 4 years ago

#8146 new defect

Unified diff in changeset view differs from exported unified diff

Reported by: anonymous Owned by:
Priority: normal Milestone: next-dev-1.3.x
Component: version control/changeset view Version: 0.12dev
Severity: normal Keywords: diff javascript bitesized
Cc: sylvain@…, davaeron@… Branch:
Release Notes:
API Changes:

Description (last modified by Ryan J Ollos)

In the changeset view the unified diff provided by clicking on Unified is different from the one which can be downloaded.

View when selecting Unified in the changeset view:

Index: trunk/setup.py
===================================================================
--- a/trunk/setup.py
+++ b/trunk/setup.py
@@ -2,5 +2,5 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2003-2008 Edgewall Software
+# Copyright (C) 2003-2009 Edgewall Software
 # All rights reserved.
 #
@@ -71,5 +71,5 @@
     install_requires = [
         'setuptools>=0.6b1',
-        'Genshi>=0.5'
+        'Genshi>=0.6dev-r960'
     ],
     extras_require = {

Content downloaded as a Unified Diff:

Index: trunk/setup.py
===================================================================
--- trunk/setup.py (revision 7699)
+++ trunk/setup.py (revision 7890)
@@ -2,5 +2,5 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2003-2008 Edgewall Software
+# Copyright (C) 2003-2009 Edgewall Software
 # All rights reserved.
 #
@@ -71,5 +71,5 @@
     install_requires = [
         'setuptools>=0.6b1',
-        'Genshi>=0.5'
+        'Genshi>=0.6dev-r960'
     ],
     extras_require = {

here the diff of the two diffs :

  • C:\Users\Absynthe\Downloads\

    old new  
    11Index: trunk/setup.py
    22===================================================================
    3 --- a/trunk/setup.py
    4 +++ b/trunk/setup.py
     3--- trunk/setup.py (revision 7699)
     4+++ trunk/setup.py (revision 7890)
    55@@ -2,5 +2,5 @@
    66 # -*- coding: utf-8 -*-
    77 #

As you can see paths in the index of the first diff are a bit custom.

Attachments (1)

patch_from_r8172.patch (350 bytes ) - added by davaeron <davaeron@…> 10 years ago.

Download all attachments as: .zip

Change History (11)

comment:1 by Christian Boos, 10 years ago

Milestone: 0.12
Owner: set to Christian Boos

We could effectively remove the a/b prefixes and have the rXXX as suffix, I think.

That would still be a difference, but a very minor one (i.e. the patch command for applying them would be the same).

comment:2 by Sylvain Rabot <sylvain@…>, 10 years ago

Cc: sylvain@… added

by davaeron <davaeron@…>, 10 years ago

Attachment: patch_from_r8172.patch added

comment:3 by davaeron <davaeron@…>, 10 years ago

Priority: normalhigh
Severity: minormajor
Version: 0.11.4rc10.12dev

You broke build with your patch.

To reproduce:

easy_install -U "Genshi==dev"
svn co http://svn.edgewall.org/repos/trac/trunk trac
cd trac
python ./setup.py install

error:

Installed /usr/local/lib/python2.5/site-packages/Trac-0.12dev_r0-py2.5.egg
Processing dependencies for Trac==0.12dev-r0
Searching for Genshi>=0.6dev-r960
Reading http://pypi.python.org/simple/Genshi/
Reading http://genshi.edgewall.org/
Reading http://genshi.edgewall.org/wiki/Download
No local packages or download links found for Genshi>=0.6dev-r960
error: Could not find suitable distribution for Requirement.parse('Genshi>=0.6dev-r960')

Patch included previously. Works for me.

Last edited 4 years ago by Jun Omae (previous) (diff)

comment:4 by davaeron <davaeron@…>, 10 years ago

Cc: davaeron@… added

comment:5 by Christian Boos, 10 years ago

Milestone: 0.12next-minor-0.12.x

comment:6 by Christian Boos, 7 years ago

Keywords: javascript bitesized added
Milestone: next-minor-0.12.xnext-stable-1.0.x

comment:7 by Ryan J Ollos, 4 years ago

Description: modified (diff)
Milestone: next-stable-1.0.xnext-dev-1.1.x
Priority: highnormal
Severity: majornormal

comment:8 by Ryan J Ollos, 4 years ago

Summary: Unified diffUnified diff in changeset view differs from exported unified diff

comment:9 by Ryan J Ollos, 4 years ago

Owner: Christian Boos removed

comment:10 by Ryan J Ollos, 4 years ago

Milestone: next-dev-1.1.xnext-dev-1.3.x

Narrowing focus for milestone:1.2. Please move ticket to milestone:1.2 if you intend to fix it.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as new The ticket will remain with no owner.
The ticket will be disowned.
as The resolution will be set.
The owner will be changed from (none) to anonymous.

Add Comment


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