Edgewall Software
Modify ↓

Ticket #8146 (new defect)

Opened 3 years ago

Last modified 2 years ago

Unified diff

Reported by: anonymous Owned by: cboos
Priority: high Milestone: next-minor-0.12.x
Component: version control/changeset view Version: 0.12dev
Severity: major Keywords: diff
Cc: sylvain@…, davaeron@…
Release Notes:
API Changes:

Description

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

  • trunk/setup.py

    a b  
    22# -*- coding: utf-8 -*- 
    33# 
    4 # Copyright (C) 2003-2008 Edgewall Software 
     4# Copyright (C) 2003-2009 Edgewall Software 
    55# All rights reserved. 
    66# 
    … …  
    7171    install_requires = [ 
    7272        'setuptools>=0.6b1', 
    73         'Genshi>=0.5' 
     73        'Genshi>=0.6dev-r960' 
    7474    ], 
    7575    extras_require = { 

  • trunk/setup.py

     
    22# -*- coding: utf-8 -*- 
    33# 
    4 # Copyright (C) 2003-2008 Edgewall Software 
     4# Copyright (C) 2003-2009 Edgewall Software 
    55# All rights reserved. 
    66# 
    … …  
    7171    install_requires = [ 
    7272        'setuptools>=0.6b1', 
    73         'Genshi>=0.5' 
     73        'Genshi>=0.6dev-r960' 
    7474    ], 
    7575    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

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

Download all attachments as: .zip

Change History

comment:1 Changed 3 years ago by cboos

  • Milestone set to 0.12
  • Owner set to cboos

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 Changed 3 years ago by Sylvain Rabot <sylvain@…>

  • Cc sylvain@… added

Changed 3 years ago by davaeron <davaeron@…>

comment:3 Changed 3 years ago by davaeron <davaeron@…>

  • Priority changed from normal to high
  • Severity changed from minor to major
  • Version changed from 0.11.4rc1 to 0.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.

comment:4 Changed 3 years ago by davaeron <davaeron@…>

  • Cc davaeron@… added

comment:5 Changed 2 years ago by cboos

  • Milestone changed from 0.12 to next-minor-0.12.x
View ↑

Add a comment

Modify Ticket

Change Properties
<Author field>
Action
as new
as The resolution will be set. Next status will be 'closed'
to The owner will be changed from cboos. Next status will be 'new'
The owner will be changed from cboos to anonymous. Next status will be 'assigned'
Author


E-mail address and user name can be saved in the Preferences.

Attachments ↑
 
Note: See TracTickets for help on using tickets.