I am having trouble with a subversion merge I've done before, and my local help is not around...so I was hoping someone here might be able to help. Yes I've read the docs, I want a human response because this merge is very important. I am trying to merge from branch123 to branch124, which was branched directly off branch 123. my merge...
My workshop has recently switched to Subversion from SourceSafe, freeing us from automatic locks. This led to concurrent editing of the Forms, which is wonderful. But when multiple developers commit their changes, the code files created by the designer (all the files named TheFormName.designer.cs) cause conflicts which are very difficult...
I have posted a question before, Moving away from VSS, in which I asked about the best VCS control for Delphi developers who were using VSS. Most developers seem to use svn with TortoiseSVN. I tried this for few days and I think it's the best route to go with. However, I still have some confusion about the way that svn works so here a...
I currently have CruiseControl.NET set up with SVN to automatically grab the code source from the repository. After having a problem with our SVN server - I recreated a different SVN location for it and changed the location of it in the ccnet.config file. This caused problems with CruiseControl.NET still trying to grab it from the old SV...
I'm using SVN through Apache with dav_svn_module like this: <Location /svn> DAV svn SVNParentPath C:/svn_repository AuthName "Subversion Repository" ... </Location> This lets me access my repos: C:/svn_repository/repo1 C:/svn_repository/repo2 C:/svn_repository/repo3 via these URLs: https://examples.com/svn/repo1 https://ex...
Using TortoiseSVN - when I use Test Merge, I get the error "http://mysvnserver/svn/main/branches/ProjectA must be ancestrally related to http://mysvnserver/svn/main/trunk/ProjectB" What can I do to resolve this? ...
I created a symbolic link from /www/dir2/ to /home/dir2/ I then added it to the repository ( svn add /www/dir2/ ) Now if I go into that directory, and try to do anything with svn in there I receive a "svn: warning: '.' is not a working copy" error. If I try to add a subdirectory (svn add /www/dir2/dir5 ) I receive the error: svn: 'dir2' ...
I've been using TortoiseSVN with Subversion for a while now. Its pretty easy to use and most of the time I just use the Update and Commit functions....and occasionally if I need to track down the author of a particular line of code I use Blame or Show Log. Recently though, I made the mistake of directly copying folders and files from a ...
I deleted a file from a repo and now want to put it back. The best I can figure out is to: update to the revision before the delete copy the files elsewhere update to head copy the files back add them commit That just smells bad and it looses all history to boot. There has got to be a better way to do this. I have already looked in T...
We currently use BugZilla for bug/issue tracking, but are looking for other solutions which hopefully fits us better. One of the features we really would like is integration with both SVN and TFS, as we use both internally (java folks use SVN, .NET folks use TFS), but I have yet to find any who does both. Many do integrate with SVN, but...
I have had a local Source Depot repository for version control since my days at Microsoft. Lately, I've been wanting to migrate to SVN and take the change history with me but there seems to be no script to migrate to SVN. Since there are quite a few Microsofties who hang out here, I thought I'd try here. I am basically looking for an ea...
According to the release notes for the iPhone 2.2.1, SDK XCode now officially supports Subversion 1.5. I've converted my working copy to use the new 1.5 format; however, XCode now will no longer track changes. I'm guessing there is somewhere in XCode that I have to tell it to use the 1.5 format. Has anyone found it yet? ...
I have access to a very large code base stored in a subversion repository. I would like to be able to perform Google type searched on the code base. I have done this before when I have access to the server by creating a network share and using Google desktop. I currently do not have access to this subversion server box. Any Ideas? ...
I have been able to get SVN working on bluehost. Next I tried to set websvn and I am able to see the main websvn page but when I click on a repository then I get this error: Error running this command: /home/username/system/bin/svn --non-interactive --config-dir /tmp log --xml --verbose --limit 2 'file:////home/username/devel//test/' /...
Whenever I try to copy an entire working copy using simple drag and drop between two computers (e.g. from an old computer to a new one, or from one VM to another) in order to avoid having to redownload the entire several GB set of code from our online repository I get an error as soon as I reach any of the hidden SVN-BASE files. Is ther...
Is the following possible??... checkout 'core' CORE / INTERFACE / corefile CORE / APP / corefile checkout 'plugin_1' PLUGIN_1 / INTERFACE / PLUGIN_1 / pluginfile PLUGIN_1 / APP / PLUGIN_1 / pluginfile checkout 'plugin_2' PLUGIN_2 / INTERFACE / PLUGIN_2 / pluginfile PLUGIN_2 / APP / PLUGIN_2 / pluginfile checkout 'core' + 'plugin_1...
Hi all, There are currently 5 developers on my team and we all access a repository through a shared drive on computer X which is on our network. Since we all have access to computer X, and we can manage who has and who doesn't have access to computer X, we can manage who can access our repository. My question is this: If I set up a ...
A question was asked recently about removing SourceSafe integration from Visual Studio 6. I need to do the same with Visual Studio 2008. Our team uses Subversion and I have installed AnkhSVN, the Subversion plug-in for VS2008 (some other members of the team use VisualSVN). I find that SourceSafe "insists" on being the integrated source ...
I have a project in subversion, called inboundem. It was my first, and when I created it, I omitted trunk. I need to get it into the correct structure as inboundem/trunk. I had another project like this, but as there were no revisions, I did svn delete and then svn import and that worked well. But I have a lot of revisions with inboundem...
Please note: This is a question about the Eclipse plugin Subversive, and not about Subversion itself. Please do not change the title to be about 'Subversion'. So I deleted a file that I really shouldn't have. I've found various approaches to restoring the file outside of Eclipse/Subversive, but I was wondering if there was a best/easie...