SVN “Already Locked Error”
If your SVN repository is locked by AnkhSVN, just use “cleanup” command from AnkhSVN to release the lock! 😉
tortoisesvn
TortoiseSVN reports conflict, but no conflict can be found
Skipped obstructing working copy this means that there’s a working copy folder in the way: your update wants to add a folder with name ‘project’, but you already have a versioned folder ‘project’ in your working copy. Maybe you moved that folder from another working copy? Or that folder is its own working copy (if … Read more
How do I only Checkout (pull down) only parts of an SVN tree with TortoiseSVN?
It looks like you were successful but I wanted to include a step-by-step guide in the hopes that it is helpful to others. Checkout trunk into a working copy with depth = “Only this item” Open working copy Go to repo browser from the working copy Select your desired project subfolder(s), right-click and select “Update … Read more
Updating from svn repository returns “Could not read chunk size” error
I was getting the “Could not read chunk size” message from clients on several machines. The key to figuring it out was this error in the Apache error log: [Fri May 07 14:26:26 2010] [error] [client 155.35.175.50] Provider encountered an error while streaming a REPORT response. [500, #0] [Fri May 07 14:26:26 2010] [error] [client … Read more
What does a TortoiseSVN cleanup actually do?
Edit: I think it’s not automatic as it needs to abort operations and unlock the working copy in /path. Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into … Read more
Command to get svn diff of current and previous revision number
svn diff -r HEAD <item> if you want to get the difference between your working copy and the last committed revision. svn diff -r PREV:COMMITTED <item> if you want to see what the last commit did. You should take look at Revision Keywords. svn info <item> will give you (among other things) the last change … Read more
What is the difference between a tag and a branch in SVN?
This is from http://svnbook.red-bean.com/en/1.5/svn.branchmerge.tags.html But wait a moment: isn’t this tag creation procedure the same procedure we used to create a branch? Yes, in fact, it is. In Subversion, there’s no difference between a tag and a branch. Both are just ordinary directories that are created by copying. Just as with branches, the only reason … Read more
What ports need to be open for TortoiseSVN to authenticate (clear text) and commit?
What’s the first part of your Subversion repository URL? If your URL looks like: http://subversion/repos/, then you’re probably going over Port 80. If your URL looks like: https://subversion/repos/, then you’re probably going over Port 443. If your URL looks like: svn://subversion/, then you’re probably going over Port 3690. If your URL looks like: svn+ssh://subversion/repos/, then … Read more
Better Merge Tool for Subversion [closed]
Perforce Merge Tool Even though Perforce is obviously not free the merge tool is. It’s 100x better than the default TortoiseSvn one. To integrate with TortoiseSvn set the merge tool to: C:\Path-To\P4Merge.exe %base %theirs %mine %merged
Shelve in TortoiseSVN?
I don’t believe that SVN has this feature built into the server product. I also don’t believe anything like this emulated in any clients that I have used, including TortoiseSVN. To get around this problem, I have resorted to using a DVCS such as Git or Mercurial, to allow me to branch/merge/shelve locally before pushing … Read more