On Jun 13, 2011, at 03:55, Richard Cavell wrote: > 1. Is svn resolved foo the same as svn resolve --accept working foo ?
"svn help resolved" says yes: Note: this subcommand does not semantically resolve conflicts or remove conflict markers; it merely removes the conflict-related artifact files and allows PATH to be committed again. It has been deprecated in favor of running 'svn resolve --accept working'. > 2. Someone suggested creating a repository by installing DropBox on every > computer and doing: > > svnadmin create ~/DropBox > > Does this seem like a workable idea (for those of us who do not know how to > set up an svnserver or apache httpd)? I would suggest you not do that. That would allow any user to do anything to your repository (bypassing any security restrictions or hooks you may want to use) -- even delete the entire repository with one or two keystrokes (intentionally or accidentally). Set up svnserve or httpd instead. The book explains how. http://svnbook.org/ > 3. Are there any moves to incorporate a keyword such as $GlobalRev$? Not that I know of. This explains why: http://subversion.apache.org/faq.html#version-value-in-source > 4. I've managed to get keyword substitution working. But once it's working, > how do I turn it off for that file type? eg > > Create myfile, containing $Id$ > svn add myfile > svn propset svn:keywords "Id" myfile > svn ci -m "Turn on Id keyword" myfile > svn up > cat myfile # Id is replaced > > Now, how do I turn it off? svn propdel svn:keywords myfile svn ci -m "Turn off Id keyword" myfile