4 ms·
With binary files, you really want an explicit checkout (exclusive lock) system - since there's typically no way to merge them. This makes the commit/merge sty
by sshumaker 17y ago
With binary files, you really want an explicit checkout (exclusive lock) system - since there's typically no way to merge them. This makes the commit/merge style SCSes a bad fit for binary assets (and partially explains the popularity of Perforce, which is a lock-based SCS).
- dalore 17y agoThat and Perforce is a commercial company that provides support with their product. By default perforce doesn't lock, but it knows when a user has a file checked out for "edit". By default all files are set read only. This was a big downside when you had no internet connection.
- koenigdavidmj 17y agoYeah, but 'chmod u+w filename' and you're back in business. The GUI has a "resolve offline work" feature that will find everything. Of course, if you don't mark it writable (and just use :w! in Vim, for instance), then a 'p4 sync' may eat your work if anyone's changed the file.
- dalore 17y agoAhh the resolve offline work feature must be new. It wasn't around when I was using perforce.
- koenigdavidmj 17y agoSadly, it has no direct CLI equivalent. You may find http://p4delta.sourceforge.net/ http://p4delta.sourceforge.net/ useful, however; it's like `svn up` for Perforce.