• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: Line endings
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Line endings


  • Subject: Re: Line endings
  • From: David Blanton <email@hidden>
  • Date: Wed, 17 Nov 2010 14:39:18 -0700

I'll take a look at Araxis Merge, thanks for the tip!

On Nov 16, 2010, at 11:32 AM, Sean McBride wrote:

On Mon, 15 Nov 2010 22:29:17 -0800, Douglas Norton said:

You can try using TextWrangler to compare the files, I've had success
with that.

The problem then passes to the VS side, where you end up checking in
files with Mac line endings and the diff in VS will report that the
whole file has changed.

Incredible that such tools still cannot deal with mere line ending changes. :(


You could use Araxis Merge, both on Mac OS and Windows, it doesn't freak
out just because line endings change.


--
____________________________________________________________
Sean McBride, B. Eng                 email@hidden
Rogue Research                        www.rogue-research.com
Mac Software Developer              Montréal, Québec, Canada





_______________________________________________ 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
References: 
 >Line endings (From: David Blanton <email@hidden>)
 >Re: Line endings (From: David Duncan <email@hidden>)
 >Re: Line endings (From: David Blanton <email@hidden>)
 >Re: Line endings (From: Douglas Norton <email@hidden>)
 >Re: Line endings (From: "Sean McBride" <email@hidden>)

  • Prev by Date: Re: Tab behavior
  • Next by Date: Re: Tab behavior
  • Previous by thread: Re: Line endings
  • Next by thread: Reference counting events not always tracked in Instruments
  • Index(es):
    • Date
    • Thread