Re: Why doesn't FileMerge work?
Re: Why doesn't FileMerge work?
- Subject: Re: Why doesn't FileMerge work?
- From: Chris Hanson <email@hidden>
- Date: Tue, 18 Mar 2008 16:03:02 -0700
On Mar 18, 2008, at 3:53 PM, Blair M. Burtan wrote:
Okay, so I have an Xcode project. I get source code revisions e-
mailed to
me. The type & creator of these revision files happens to be for
Codewarrior but the current version files are Xcode files.
Every time I try to use FileMerge it always says there is one change
on the
first line of the file and refuses to show any other changes.
The files probably have different line endings. The revisions you
were emailed -- the ones with CodeWarrior type & creator -- probably
have Mac or Windows line endings, while the ones in your Xcode project
probably have Unix line endings. Use any of a number of text editors
or other tools to change the files to have consistent line endings,
and FileMerge, Changes, and other tools should be able to compare them
with no issues.
Also, since you appear to be emailing around code changes for a multi-
person project, I strongly suggest you set up a source code management
system such as Subversion, Perforce, Git, Mercurial, or any of a
number of other SCM systems. Subversion, Perforce and CVS have basic
support integrated into Xcode, and any project worth doing at all is
worth using SCM on in this day and age.
-- Chris
_______________________________________________
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