Daniel Lyons
|
Re:Script for using bundles in subversion - 2006/08/28 15:41
This is a good start, but it only solves one of the two bundle problems, which is if the Subversion metadata is somehow removed.
There is another problem that will have to be solved though, which is the problem of changes inside the bundle. For example, OmniGraffle stores its files as bundles, with almost all of the data in an Info.plist. If two users work on the same OmniGraffle file simultaneously, Subversion will mark the inner Info.plist files as conflicting. Of course, you can't "merge" the changes in a property list representing vector graphics.
I would suggest that some bundles, or maybe all bundles, need to be treated atomically. Nothing should prompt for merging when it would be as meaningful as, say, merging conflicts in a JPEG or an MP3.
|
