Unified diff

[anonymous]

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\

@@ -1 +1 @@
 Index: trunk/setup.py
 ===================================================================
---- a/trunk/setup.py
-+++ b/trunk/setup.py
+--- trunk/setup.py (revision 7699)
++++ trunk/setup.py (revision 7890)
 @@ -2,5 +2,5 @@
  # -*- coding: utf-8 -*-
  #

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

[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).

[davaeron <davaeron@…>]

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.