tortoisesvn

I've got a Visual Studio C# project which is under version control (SVN). I've always commited and updated the project without any problems. But a couple of hours ago Visual Studio throws the following error when I try to launch/rebuild the project: Files has invalid value "<<<<<<< .mine". Illegal characters in path. I don't know how to fix this problem. What should I do? That happens when svn encounters a conflict: You changed a file, the file on the server was changed and it cannot (easily) be merged automatically. You need to decide what is the correct solution now. Subversion just adds the

When I'm doing a TortoiseSVN merge, it includes a bunch of directories, and some files into the modified files, even though there are no actual changes. It changes the property svn:mergeinfo . Is there any reason why these properties set on the directory/files are needed? Is there any way to get around not doing these changes to svn:mergeinfo ? I usually just revert the items then commit, but this wastes extra time. That is happening, very likely, because those files and directories have the svn:mergeinfo property set from a previous merge. I don't think it's generally a good idea to merge

In tortoiseSvn 1.8 there is no "reintegrate" a branch option. What is the right way to reintegrate a branch in Tortoise Svn 1.8? In choose merge and then next option: Then I get next window: Or am I doing something else wrong? Just merge branch to any TARGET Edit OK, extended answer: "Merge for Dummies" in pictures Preface OK, I will not mask or hide used proving ground. Used in this sample resources: Repository "Hello, World" http://mayorat.ursinecorner.ru:8088/svn/Hello/ Branch http://mayorat.ursinecorner.ru:8088/svn/Hello/branches/branche-francaise Trunk of repo http://mayorat.ursinecorner

I committed a bunch of files (dozens of files in different folders) by accident. What is the easiest, cleanest (and safest!) way to 'undo' that commit without having to delete the files from my working directory? CMS Go to Show Log Screen, select the revision that you want to undo, right click it and select Revert changes from this revision , this will do a reverse-merge . jcoby You may need to use the command line, but you can use the SVN merge command and specify the revisions in reverse to effectively revert a commit. Assuming your bad commit was r1123, you would do: svn merge -r1123:1122

Been using SVN branches with Tortoise 1.6. I've been periodically merging the trunk into the branch to keep it up to date. Today, I thought I'd reintegrate the branch. I chose "Reintegrate a branch" from Tortoise and received the following error message: Reintegrate can only be used if revisions 4709 through 5019 were previously merged from http://subversion/svn/saxdev/trunk to the reintegrate source, but this is not the case It then listed around 50 files with descriptions such as this: Error: branches/qst/kobalt/sax/businessobjects/util/HistoryParent.java Error: Missing ranges: /trunk/kobalt

How can I "delete" a file which is already in the SVN repository without deleting it from my file system? TortoiseSVN or command line instructions are welcome. The following works, but I am hoping for something nicer: Copy the file to some other location outside the repository. SVN Delete the file. Commit Copy the files back and make sure to ignore them on future commits. svn delete --keep-local the_file crashmstr Deleting files and folders If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use Extended Context Menu → Delete (keep local). You

A problem has started occurring recently in which some new files added to the subversion repositories don't get pulled down to other clients after doing an Update. If I browse the repository with Tortoise I can see the file. I can then right click on it and select 'Update to revision', which will pull the file down to the client. Unfortunately this is very time consuming as there is no way to pull down all files in a folder - i.e. I have to do this for each file individually. The weird thing is, it doesn't occur with all files and it is not occurring on all client machines. I have tried