On Jul 17, 2007, at 9:34 AM, Ian Bicking wrote:

>
> Christoph Haas wrote:
>> On Mon, Jul 16, 2007 at 03:19:16PM -0700, Ben Bangert wrote:
>>> On Jul 16, 2007, at 2:40 PM, Jose Galvez wrote:
>>>
>>>     Sure,
>>>     First I was testing with pylons-0.9.6rc2dev_r2256-py2.5.egg
>>>
>>>     The project was created with pylons 0.9.4.1 and then  
>>> converted after
>>>     installing rc2 using overwrite the test project was not  
>>> installed using
>>>     easy_install simply created and run from the created egg
>>>
>>> Ah, when converting projects I highly recommend using the diff  
>>> option with
>>> paster, then backing up the old file and merging changes. This  
>>> way you don't
>>> miss important things, which happened in your case.
>>
>> Is it possible to make that a tad more comfortable? Like running a
>> predefined command on those two files? vimdiff or kompare come to my
>> mind. Currently I'm watching the diff (which isn't always easy  
>> because
>> the output is confusing - you have to search thoroughly where the
>> current diff starts), launching another shell and running vimdiff.  
>> I'm
>> sure that can be improved. Or should I bug Ian about that?
>
> Isn't it easier at that point just to backup the files and diff the
> backup and the new file?
>

What you really want is the ability to interactively merge the  
changes on the spot. Command line sdiff can do this. I almost think  
Paste should default to using it if it was available (it's on most  
unix boxes), but unfortunately, Windows of course doesn't have it.  
Maybe one day someone will make a pure python version.

I'm sure there's GUI apps that can do what sdiff does (if not vimdiff  
or kompare, I'm not sure what they provide). Allowing a custom diff  
would at least let you use any one of these

--
Philip Jenvey



--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"pylons-discuss" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/pylons-discuss?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to