I have the following ignore in my Tortoise settings: *.pdb *.suo *.user *.cache */_ReSharper */bin */obj *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo *.rej *~ #*# .#* .*.swp .DS_Store But bin and obj folders as well as reSharper still get submitted. Second, is there a way in Windows if using Tortoise and Visual SVN Ser...
I'm currently maintaining a project I've inherited from some one else and the SVN repo is a bit of a mess. I've gone through and cleaned most of it up but there's a folder in the repo where admins can upload files to via a web form within the application. Currently this folder is in SVN and contains several images in SVN. Being the SVN r...
I am getting a SVN server setup and will be using the feature branch method. I plan on having 1+ branches making up a release tag. How do I merge (?) multiple branches into the release tag, while still maintaining diffs and such? I've given an example of our workflow below. Multiple devs pull to local Create feature branch Commit to bra...
My Vista Home Basic SP2 machine misses the relevant Registry values, described under Page 171 of the tutorial (latest and relevent edition) The registry keys which hold the information on which context menus to show are HKEY_CURRENT_USER\Software\TortoiseSVN\ContextMenuEntriesMaskLow and HKEY_CURRENT_USER\Software\TortoiseSVN\Con...
In my repository, lets say I have this: Animal Dog Beagle Hound ... Lets say I checked out Dog to a working directory and I realized, whoops, I really wanted to checkout Animal. I can delete my working copy, the Dog directory, and checkout Animal, but is there way I can do so without deleting and checking out again? ...
Somehow someone has manage to create two folders with the same name except the case of the first letter (eg "trunk" and "Trunk") which causes the svn update to fail (because windows being case insensitive wont allow the creation of both folders). How can I revert these changes on windows (and without direct access to the svn server)? I...
I'd like to be able to see someone's total lines of code contributed to our application. Say the app is 10k lines of code, I'd like to see the breakdown of how many LOC each developer has committed to the repository. Is there anything for SubVersion to get this kind of info? ...
My repo has one dir containing some very large files, every time those get changed it wastes a few minutes of my day when I update... they're not files I need. Perhaps ideally they'd be in their own repo, but that's not an option to me... is there a way I can make SVN not include that dir when I update the whole working dir, but wtill a...
When running a commit with the trac-post-commit-hook I receive a MERGE 200 OK error, I understand that this means that the commit has succeeded on the server but the file status has not updated on my local machine. But I can't find anyway to fix this issue. Would this be a problem with my setup or something in the script. I'm using s...
I'm looking at the log messages for a particular branch in TortoiseSVN. We have an automated build process which has commits regularly to the branch using the author "builder". In the TortoiseSVN search box, you can filter by authors and you can use regular expressions... what search expression can I use to show all the log messages no...
I have a folder structure like this: /some_folder /tmp /tmp/foo /tmp/foo/fu * /tmp/bar /tmp/bar/bah * /tmp/bar/ba * /tmp/foobar * /more_folders The /tmp directory is being used for caching and whatnot, so I want to have the folder structure under version control, but ignore all the files inside each directory. File...
I would like to do exactly as the subject says. It's not possible to merge the current branch to the trunk yet, otherwise, that's what I'd do. The subbranch (or whatever the term is) will be merged with the branch and then the branch back to the trunk. Theoretically, this should work - does anyone see any problems with this? Thanks i...
I seem to remember seeing this somewhere, but for the life of me search is not turning up the results I'm looking for. Here's what I want: I have a project repository. There are libraries in other svn repositories that I'd like to include within my project. When I do an SVN commit on the master project, I'd like all of the files, inc...
On the project I'm working on, we have a file with svn:needs-lock that's frequently in contention. We frequently have to IM each other "let me know when you're done with X". If it's not really urgent, I would prefer not to interrupt my coworker if I don't have to. Is there a util out there that will create a background process which w...
I merged a branch to another branch and then made some of my own changes. When I went to check in the changes, I got this error: Error: - C:\dev\Backend\Backend_1.1.0.0 In directory C:\dev\Backend\Backend_1.1.0.0\Unit Tests\MessageProcessor.Tests' Error processing command 'committed' in 'C:\dev\Backend\Backend_1.1.0.0\Unit Tests\Messa...
Let us say I have a trunk and I create a branch (branch A) of it on Sunday making Revision 10. On Monday I work on both branch A and the trunk (branch A is responsible for Revision 11,12,& 15 while trunk is responsible from 13, 14, & 16). Tuesday I created a new branch (branch B) from the trunk (Revision 17). Wednesday I work on both ...
TortoiseSVN seemed to be slowing down my Windows Explorer a whole lot. So I scouted around and was reminded (via google) that there is a feature available via the TortoiseSVN Settings dialog where you can exclude certain paths from the Icon Overlay treatment. So I excluded the whole of the D: drive (by putting the line D:* in the "Excl...
I'm relatively new to SVN and have a rather basic question. I have several small versioned resource images for a web project. Today the designer updated one of those resources, so I should replace it. Is the only way to update this file by first svn-delete it, commit and then svn-add the new one? EDIT As mentioned in the response, I c...
Is there a way to view what commands are being executed by TortoiseSVN? There are a few things that I'd like to write a hook for on check-in that I only know how to do in Tortoise. It would be helpful if I could see what commands Tortoise was executing to create my hooks. ...
We're using subversion, (the question could be applicable to many version control systems, but subversion is the one I really care about.) Our repository layout looks like so: (Layout A) Web branches tags trunk Libraries Foo branches tags trunk Bar branches tags trunk WindowsClient branches tags trunk DB branch...