On 20 Mar 2008, at 10:27, Jean-Daniel Dupas wrote: Le 20 mars 08 à 11:08, Robert Tillyard a écrit : On 19 Mar 2008, at 23:40, Chris Espinosa wrote: On Mar 19, 2008, at 4:32 PM, Gerd Knops wrote: On Mar 19, 2008, at 6:08 PM, Chris Espinosa wrote:
On Mar 19, 2008, at 3:38 PM, Jim Prouty wrote:
At 6:25 PM -0700 3/18/08, email@hidden wrote:
Well, FileMerge has a fairly abysmal UI and we haven't updated it in
many years. We're addressing that.
The main issue is that you're comparing a newline-delimited file
against a Return-delimited file. Whoever mailed you the source code
revision converted the file to a different line endings, and you have
to convert it back in order to compare it.
It's 2008, and comparing files with different line endings is a "solved
problem". Apple should do better by its developers.
You might want to check out the integrated SCM file merge in Xcode proper, which a) is growing to address all the cases covered by FileMerge (but hasn't yet) and b) does this properly.
We're not investing in fixing the creaky old FileMerge because we've been diligently replacing it with an integrated function that works right.
Bummer, I was looking forward to FileMerge enhancements as I do most my Cocoa programming in TextMate (though with Xcode3 xcodebuild has become almost unbearable, frequently spending extended amounts of time in the "Checking Dependencies..." phase).
You filed a bug on the xcodebuild delays on 10/27/07 and we replied on 10/29 with a workaround, and the fix is available in the Xcode 3.1 Beta.
Chris
That's a shame, I rely on FileMerge as I use my Mac as an X Terminal to develop code on a UNIX server, I have the source mounted via NFS and use FileMerge to check for changes in code submitted by e-mail.
Is there any chance that we can keep FileMerge? I don't really want each developer to have to buy another product to make the Mac useable again. We have this problem with Windows users who need to buy an X Server, then lots of other bits that OS X has included, I don't really want that for Mac users.
Thanks, regards, Rob.
I you had read all answers before replying, you should be aware that FileMerge functions will be available in Xcode when FileMerge will disappear. So why would you keep file merge alive?
Chris: «You might want to check out the integrated SCM file merge in Xcode proper, which a) is growing to address all the cases covered by FileMerge (but hasn't yet) and b) does this properly. We're not investing in fixing the creaky old FileMerge because we've been diligently replacing it with an integrated function that works right.»
I was aware from the thread that FileMerge features will be moving to Xcode, I guess I'll need to wait to see how that works before I get too upset about FileMerge going. I only need the file/folder comparison feature (i.e. a GUI diff) for all files not just source files.
None of my UNIX code is in an Xcode project so I guess I could still use it if it's possible to compare two files from the Finder but if I have to create a project and move the code to the project then that will be too much of an overhead for the number of files I deal with.
With FileMerge I could just navigate the NFS share to the source, select the two files and drag them (or whole folders) to FileMerge, sometimes the two folders are on different servers. We probably won't know how this is going to work until we see it in Xcode (assuming it isn't already there in an unmentionable version) so I guess I'll have to wait but it is difficult to see for my situation how moving the features to Xcode would not make it harder to use.
FileMerge as it stands now works well for me so I suppose I could just keep a copy of it somewhere and use it until an update comes out that breaks it.
Regards, Rob.
|