tortoisesvn

We have certain configuration files which we want to be in version control as they specify project's default settings: search path, conditional defines etc. Unfortunately these files are also used by the IDE (Delphi 5) to hold temporary information. The IDE continually updates the files during development which causes Tortoise to flag the working directory as modified all the time even though all that might have happened is a build of the project. Sometimes we do genuinely want to commit changes to these files, for example if the projects search path dependencies change, but the grand majority

I am currently making a script in which I have been coming familiar with Tortoise SVN and it's corresponding command line functions. I have the script properly updating to find which "Revision" properly builds with a series of test. After the script records that variable (of the version number to be specific), I update to the HEAD revision (So that I am able to a commit after this process I am having trouble with). My question: How do I revert to a specific revision number from the command line? I know that you can svn update -r , but how can you do it with a revert so that way it changes my

I had a problem with committing changes after merging two branches of my project using TortoiseSVN. Here are details: I did a merge branch to trunk of project which I am working on. Project includes main repository and libraries joint to main repository as svn external (libraries are also branched) as subdirectory of project . When I was trying to commit changes TortoiseSVN said: Commit A re all the targets part of the same working copy? Unable to lock 'D:\websites\project\lib' Please execute the "Cleanup" command. Of course Cleanup didn't help. svn:external keyword for project directory was

I have a few files of a .NET app that are different in the production server from the development server. For example: Web.config MasterPage.master account/account.aspx blog/Web.config and a few more... What is the best way to manage these differences with SVN? I've heard everything from maintaining a config folder in the trunk to creating a branch with the "different" files, then merging them into the release tag. I use SVN trunk for main development (stable) and tag the trunk when it's ready to be released. The trunk deploys to my development server and the release tag deploys to the

I want to set up TortoiseMerge as a merge tool in Visual Studio 2010. I'm using TFS for source control. In Visual Studio I configured TortoiseMerge to be a merge tool and gave it parameters specified here /base:%3 /mine:%2 /theirs:%1 /basename:%8 /minename:%7 /theirsname:%6 /merged:%4 /mergedname:%9 When I try to merge, the Merge Target says that it is not found. What am I missing? I have been using TortoiseMerge for years and that message always appears during merge. Not sure why, but merging works, saving the file works (it's considered you've done the merge) and most importantly VS (or TF

I'm working with an SVN setup with a lot of repositories. I'm trying to consolidate some by moving the trunk of one into the branch of another (the old ones are themed versions of the new one, minus some code fixes I'll be applying later, so it makes sense to me). Short version, I want to go from RepositoryA/trunk to RepositoryB/branches/RepAName. Ideally, I'd like to maintain the history. I could do an export -> import, but that loses the history and so it isn't ideal. I can't do a dump via svnadmin, since that seems it would overwrite RepositoryB (or fail, but I'm not about to risk losing

I'm using TortoiseSVN to merge into branch-B the latest changes from trunk , including a folder rename. Before that, I reintegrated branch-A into trunk . In that branch, a folder had been renamed and changes had been made to the files in it. Branch-B contains different revisions to those files, but the folder still has the original name. When merging trunk into branch-B , SVN simply adds the renamed folder as new, and reports a tree conflict on the originally named folder. The file revisions themselves are never merged and I'm left with both folders. I've tried multiple options to get the

I'm currently working with Apache and SVN with ActiveDirectory Authentication. The user is using TortoiseSVN client. I should point out that I have 2 repos with same name and different mapping but redirected to the same "user url" since the permissions are the same for both repos. eg 'http://mysrvr/svn/foo/bar/corge' and 'http://mysrvr/svn/foo/corge' or 'http://mysrvr/svn/foo/bar/corge and' 'http://mysrvr/svn/foo/grault/corge' This 2 repos thing is replicated with 8 "repo pairs" and the remaining 7 are working just fine. Here is my error: Commit failed(details follow): access to '/svn/myDir

Using VisualSVN and TortoiseSVN here. I've renamed my file. I notice it say add and delete which to me means history may be erased? What is the best way to rename a file without losing history in Subversion? Right Click on the file > TortoiseSVN > Rename. The history won't be erased, but you will lose history tracing, as it would seem to be two unrelated files. From TortoiseSVN docs : If you want to do a simple in-place rename of a file or folder, use Context Menu → Rename... Enter the new name for the item and you're done. Repairing File Renames Sometimes your friendly IDE will rename files