I just did an svn merge to merge changes from the trunk to a branch: $ svn merge -r328:HEAD file:///home/user/svn/repos/proj/trunk . --- Merging r388 through r500 into '.': A foo A bar C baz1 C baz2 U duh [...] But there were too many conflicts, so I'd like to undo that. One way to do that is to commit and then merge ...
I have been asked to do the following: a) Build a VM for a subversion server b) Figure out an autobuild system and regression test system c) Write documentation or simple instructions to get people started with subversion I am not really sure what these instructions mean - although I have a vague idea. If you know could you provide som...
Due to lack of Mercurial support in several tools, and managerial oppression it has become necessary to convert several trial Mercurial repositories to Subversion in order to conform with the company standard. Are there any tools or suggestions for how to achieve this without a loss of revision history and the like? ...
Hi, I have a svn configured in the windows server and having 2000 more revisions. So i would like to change the sever from Windows to linux, so i want to backup all the revision and restore to the new svn configuration under linux. How is it possible?? ...
Hello, Im using Eclipse Galileo and have installed Subclipse. I looked at the svn repo url at http://www.liferay.com/web/brian.chan/blog/-/blogs/changes-to-anonymous-access-to-liferay-s-svn and then tried to get Liferay from their SVN repository in Eclipse, using svn://svn.liferay.com/repos/public --username guest,but i get the followin...
Hi, I've read a number of topics in the same sort of ballpark as this one, but in all honesty I'm still not exactly sure on the best approach (as a starting point). I am a solo developer in a small office and I have around 30 websites which are hosted on a linux VPS. I want to start using using version control (probably SVN) and also set...
Does anyone have experience with a library or tool suite that helps an ISV deliver software updates of shipped products? We ship software that runs on OS X, Linux, and Windows. We have partial solutions that are platform-specific for each platform, but we would like to have a single, unified system for pushing out software updates to our...
My company is having trouble figuring out the best way to manage our builds, releases, and branches... Our basic setup is we have 4 applications we maintain 2 WPF applications and 2 ASP.NET applications, all 4 of these applications share common libraries, so currently they are all in one folder /trunk/{app1, app2, app3, app4}. This make...
svn up svn: Error writing to '.' svn: Can't write to file '.svn/tmp/entries': No space left on device If my box is out of hard drive space, that is impossible, becauase it has 620GB of HD. ...
Strange one this, which isn't programming related directly, but I thought it important to ask here instead of ServerFault.com, as it is directly related to TortoiseSVN/Subversion usage. Basically, through normal usage, TortoiseSVN operates absolutely fine with our Subversion repository, but as I'm responsible for our continuous integrat...
When files are deleted from as svn repository, they can still be accessed by users checking out old revisions. This is obviously one of the great advantages of source control. Is it possible to erase a file from the repository? I am aware that this would compromise the integrity of past revisions containing the file. For example, propr...
I am trying to install buildbot for my project. I always run my svn commands with trust-server-cert option. How can I pass that to SVN thru buildbot? I don't see there is a way for doing that. What is the shortest workaround? ...
Where would you put documentation for a team web project? Our system is based on ASP.NET/C#, but I guess this problem is applicable to many other solutions/languages. Currently, we have the following types of documentation: Text, descriptions, guides etc (mostly text, but some .doc) Visio files (graphs, flowcharts, database diagrams)...
I know the answer is out there, but I'm pretty Unix-dumb and probably wouldn't recognize the solution if it hit me in the face. I'm on a Mac, connecting to a SVN server via SSH tunneling. I have to ssh-add privateKey.txt every time I want to connect to the SVN server (Both Cornerstone and Xcode are connecting to SVN). Is there a way...
When attempting to create a tag of a working copy we receive the error, Commit failed: File '' already exists. In attempting to diagnose the issue and have identified the following convoluted re-creation scenario. We have a staging environment used for testing and QA releases. Development is never done on the staging environment and th...
I want to make SVN ignore everything that is in my wordpress directory. It bring me nothing but headaches because of auto updates to plugins etc. When I... svn propedit svn:ignore ./blog It tells me... svn: None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and no 'editor-cmd' run-time configuration option was f...
I have a intervalTrigger that runs off subversion source control. I update subversion but it doesn't trigger the build. I have the exact same setup on another server and it works. How can I troubleshoot this? Is there a log I can look into? I don't see any error messages. The new server is VMWare ...
Hello, I am having problem with uploading file to SVN repository from Tortoise SVN. I can upload all files except some specific files which always fail List of Files Rhino.Mocks.dll System.Data.SQLite.dll Microsoft.Ajax.debug.js On SVN the error log contained these entries. [Tue Dec 15 15:03:33 2009] [error] [client xxx.xxx.xxx.x...
Hi! I am participing in a Free Software Contest, and we have to use a forge that uses GForge, with only support for SVN, but I will like to use Git (using gitorious) for example. There is a simple way to get two repositories (one on SVN and other with Git) updated more or less at the same time? ...
In order to avoid too much testing, I would like to provide the Quality Assurance (QA) team with hints on which features have to be regression tested after a development iteration. Do you know tools that could do that on a C++ and Subversion (and visual studio) dev environment ? Details about the use case: Features would be defined by...