Mailing Lists: Apple Mailing Lists
Image of Mac OS face in stamp
 
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Better diff tool?

On Apr 28, 2005, at 8:04 PM, Shawn Erickson wrote:
er... I'm confused. I use CVS, but I don't see any tags _within my files....?!


CVS doesn't add them. They are called keywords. Users can add them to the files if the want and if found then CVS will insert the data requested by the keyword at the time of checkin.

And to further the fun that is dealing with CVS (where is my dripping with sarcasm font again?): while CVS doesn't add the keywords automatically, it will happily expand them anywhere it runs into them as its default behavior.

In particular, CVS will quite happily expand "$Id$" into "$Id: bunch o' mostly useless info$" in the middle of, say, an image or sound file if that particular byte sequence happens to randomly popup in the middle of such a stream. To further complicate matters, the expansion is a silent operation such that you typically don't realize the image is hosed until some later checkout (often when building for production release, in my experience).

So, make sure you keep your CVSROOT/cvswrappers file up to date with a list of all the files that should be treated as binary. And, if you add a file to your workarea prior to having added the file to cvswrappers, you need to manually add the '-kb' flag via 'cvs admin'.

Subversion handles this much better. It defaults to never expanding keywords. It is up to you to determine to what level you want to enable this feature. Subversion also does a much better job of dealing with binary files, in general. In particular, you can use the full range of mime-types to indicate the types of files; quite handy when browsing the repository using HTTP based tools.

b.bum
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/xcode-users/email@hidden

This email sent to email@hidden
References: 
 >Better diff tool? (From: "Zacharias J. Beckman" <email@hidden>)
 >Re: Better diff tool? (From: Bill Bumgarner <email@hidden>)
 >Re: Better diff tool? (From: Marco Scheurer <email@hidden>)
 >Re: Better diff tool? (From: Markian Hlynka <email@hidden>)
 >Re: Better diff tool? (From: Shawn Erickson <email@hidden>)



Visit the Apple Store online or at retail locations.
1-800-MY-APPLE

Contact Apple | Terms of Use | Privacy Policy

Copyright © 2007 Apple Inc. All rights reserved.