It's amazing that you can stare at something for so long and someone else can see the obvious in 15 seconds. =)
Worked like a charm, thanks. -vedder On Dec 23, 2:58 pm, Dirk Stoop <[email protected]> wrote: > Hi veddermatic, > > Any chance that the filesystem on that NAS volume is case-sensitive? > > When I look at the output you posted, the “s”-es in “settings” are > lowercase in all of the file names in the error message, and uppercase > in the directory listing. Also, while both of these: > > “._button_apply323Settings.gif.svn-work*” > “button_advanced323settings.gif.svn-work*” > > exist in the props directory, I don't see a file named: > > “._button_advanced323settings.gif.svn-work” > > Can you let me know which protocol you're using to access the NAS > volume from your Mac? (SMB, AFS, NFS?) There might be some known > problem with case-sensitivity and the protocol you're using, but > that's just a wild guess on my behalf -- it may not even be related to > the trouble you're experiencing. > > The easiest way to fix this probably goes like this: > > 1. Temporarily move anything with uncommitted changes you want to keep > elsewhere (outside of your working copy) > 2. Delete the “buttons” directory from your working copy (Finder > delete, not svn delete) > 3. Update your working copy > 4. Place those files you set aside back and commit your changes > > Note that if anything you moved out of the way is actually a folder, > you'll have to delete the “.svn” folder that's in there before you add > it back to the working copy, to avoid confusing SVN.. > > Good luck and let me know how it works out, > - Dirk > > the Versions team > > On Dec 23, 8:44 pm, veddermatic <[email protected]> wrote: > > > > > I accidentally added a "dot file" that OS X threw on the NAS volume I > > have a repository checked out on, and now I'm stuck in lock hell. > > > Running 'Cleanup Working Copy Lock On...' gives me this error: > > > ===== > > In directory '/Volumes/share/misc/prjk_branch_55/gui/img/buttons' > > Error processing command 'committed' in '/Volumes/share/misc/ > > prjk_branch_55/gui/img/buttons' > > Can't move '/Volumes/share/misc/prjk_branch_55/gui/img/buttons/.svn/ > > props/._button_advanced323settings.gif.svn-work' to '/Volumes/share/ > > misc/prjk_branch_55/gui/img/buttons/.svn/prop- > > base/._button_advanced323settings.gif.svn-base': No such file or > > directory > > > ==== > > > However, we can see: > > > === > > macbook-2:.svn vedder$ pwd > > /Volumes/share/misc/prjk_branch_55/gui/img/buttons/.svn > > macbook-2:.svn vedder$ ls -al props/ > > total 68 > > drwx------ 1 vedder vedder 16384 Dec 23 14:22 ./ > > drwx------ 1 vedder vedder 16384 Dec 23 14:12 ../ > > -rwx------ 1 vedder vedder 79 Dec 23 > > 14:22 ._button_apply323Settings.gif.svn-work* > > -rwx------ 1 vedder vedder 79 Dec 23 13:54 > > button_advanced323settings.gif.svn-work* > > macbook-2:.svn vedder$ > > ==== > > > Said file is in fact there. > > > OS X's command line svn is at 1.4.3, so I can't command line it > > (although I'm using MacPorts to upgrade now) but was wondering if > > there was some secret mojo to fix this from within Versions. This > > will teach me to be more careful in what click on when adding files =) -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
