We've got a sizable chunk of auto-generated code that we keep around in subversion. Sometimes I'm working on a piece of the generator while another coworker is working on a different piece of the generator. One of us checks in, and the other gets the latest. Now our generated code is in conflict. Because it's generated it'll be corre...
I read an interesting SO discussion on putting separate projects in their own repos or not. But my question is about a single project, which has code, and then a lot of artwork - hundreds of Mb at least. At a simple usability level, it's annoying that telling a developer to "go get a working copy" means waiting ages for the whole art sec...
I'll be honest, SVN branches scare me. The last project that I worked on which used them extensively, I seemed to spend half my time testing my branch worked, doing a dummy merge into trunk, doing a real merge - only to find someone else had just committed while I was doing this and I had to update and start over. On that particular pro...
UGH. I installed the subversion plugin for RadRails so tha I could commit changes to my SVN repository. But when I now try to do an script/plugin install git://... I get an error: svn: This client is too old to work with working copy I removed the plugins, removed all the .svn files, removed the opt/subversion removed the symlinks.....
Grrr, getting an error in RadRails that I need to upgrade suversion when I try to run script/plugin install. So I followed the instructions to download the .dmg for 1.6.6. I have tried to save the PATH for /opt/subversion/bin by editing ~/.profile, and even editing the etc/profile file. No avail. It still comes up svn --version as 1....
There are 2 members in our team. We use Xcode's SCM (use SVN) to manger our source code files. We all add files to our Xcode project. He has commited to svn server. When I update, Xcode find there has conflicts in project.pbxproj file.Then I select quit Xcode and manual merge the conflicts. Then I start to edit my project.pbxproj, merge...
I'd like to avoid creating svn mergeinfo property on anything but the root of branches. We have a trunk branch and some other branches. Assuming I know absolutely nothing about svn triggers, what steps do I need to follow to setup a pre-commit hook that prevents additions of mergeinfo properties to anything but the root of branches? Th...
Hi all. I'm going to write a little library and after the UI for agregating and visualizing statistics from the specified subversion repository. My question is: What do you need like a developers/leads/managers to see on the statistics ? Here I put down some initial ideas : 1. Commits by author(s) 2. Files that were changed by the...
I accidentally added and committed a file with the wrong name. No problem. Tortoise has a rename command. The command deleted the original and added the new file. Is this just a short cut for copy, delete, and add? Does this command do anything else behind the scenes? ...
Using Subversion I try to commit with: svn ci dir/filename And I get this: svn: system('emacs svn-commit.tmp') returned 256 What does this mean? How can I to fix it? ...
Is there an easy way to, on commit of a file, automatically insert information into the code file itself (like author, commit comment, commit date, etc)? I would want this information appended to a block at the top of each committed file. Essentially the entire revision history should be documented in each code file... I see there is a ...
I'd like to add a symlink to an SVN repository via TortoiseSVN. SVN does support symlinks as "special" files, but Windows can't create POSIX symlinks. Is there some magical workaround? Would creating one through, e.g., cygwin do the trick? ...
Hello, 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...
I have a Rails application working on Passenger deployed using Capistrano from a subversion repository. The subversion repository is lost. We just have a folder named "cached-copy" which I believe has been made by svn. Is it possible to recreate a subversion repository from this "cached-copy"? ...
How can I configure the subversion server to hide the full repository path from the outside world? For example, the repository lives under /home/svn/foobar/ ... I want to access it via ssh as svn+ssh://[email protected]/foobar Thank you in advance ...
We had a series of unfortunate events with our VisualSVN server yesterday and we are trying to get back on track today. I have recreated the repository as suggested in this stackoverflow post. We recreated the repository with a co-workers working copy folder (svn-export, svn-import). But now when he tries to update we get an error mes...
I'm reorganising my repository by using TortoiseSVN to do move folders in my working copy, to avoid having to re-download the whole thing if I make the changes in the repo directly. However the "Moving..." popup seems to just stay around for ever in many cases, even when the dir being moved has few files. The files seem to be moved ok, e...
Using Netbeans I once checked out a project from a SVN repository, just to test SVN functions in Netbeans. Now, everytime I create a new project, or open an existing project not under source control, Netbeans "thinks" is under version control in that repository I was playing with. How can I tell Netbeans to forget everything about that...
I'm just starting out using subversion with the goal of using it to control my website. I've set up the repos, imported all the files for the website and I am happily checking things in and out and it's a wonderful experience not having to remember which files I changed on which computer so I can grab the latest version from the live se...
I'm using the built in SVN with Mac OS X and I checked out a project via command line. I got all my projects and everything but the .svn folder wasn't created like it was on my PC. And now SVN is just treating my project like a folder and I can't do updates or anything. Any ideas? .svn is not a valid folder name for Mac ...