Re: [OT] FileMerge as a vacuum (Re: What are your top desiredimprovements in Xcode ?)
Re: [OT] FileMerge as a vacuum (Re: What are your top desiredimprovements in Xcode ?)
- Subject: Re: [OT] FileMerge as a vacuum (Re: What are your top desiredimprovements in Xcode ?)
- From: Jerry <email@hidden>
- Date: Mon, 19 Feb 2007 15:36:58 +0000
On 19 Feb 2007, at 15:05, James Larcombe wrote:
Laurence Harris wrote:
I just used FileMerge 2.2.1 to compare two HTML files. It
sucks because:
- It says there's only one difference even though there are
dozens of differences. The one line it says is different is
not.
Alas, FileMerge only works correctly with Unix line endings.
This can be inconvenient, but as soon as I realised what was
going on, I checked out a fresh repository from CVS with the
required line endings, and have had no problems since. You
should be able to do the same thing with your source control
system.
Mind you, it can be useful behaviour. If Xcode has changed the line
endings on all or part of your source file again (why does it do
that?), FileMerge lets you know straight away. I always run FileMerge
before a checkin for precisely this reason. Personally, I feel that a
change in line endings should count as a diff. The fact that
FIleMerge can't cope with old-style Mac line endings is a problem
though.
- The names of the commands in that menu are misleading.
They have names like "Choose left" even though they don't
actually "choose" anything.
They do - they choose the changes from one file or the other
to put into the merge file. Drag the splitter bar at the bottom
of the window up to see (and even edit) the merge file.
Also, you can use the up and down arrows to move between differences,
and the left and right arrows to choose the left and right changes,
so you can do a whole merge very quickly using just the arrow keys. I
never touch that popup menu button thing - it's too fiddly.
Jerry
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden