svn

Manage VSS to SVN migration

Our organization is making a migration from VSS to SVN. Now, due the lack of branching on VSS there's a folder with the source code from the last production environment code it was used like a queue where the new code was pushed to the top of the queue then it basically depended on a very manual thing and it was all or nothing scenario....

Replacing trunk with branch in Subversion

Let's say people have been working on the trunk and on a branch of a Subversion repository. I want to discard any changes on the trunk, and replace it with a copy of the branch. As suggested in another question, I can just move or remove the trunk, and then copy the branch over to the trunk. But then the trunk's history is replaced with...

Advice on setting up a server to host source code and other documents...

Hi, today we keep our documents and source code, using subversion, on a server hosted by another company out on the internet. This has worked well so far. However, we have now gotten an office and would like to keep all the documents in-house. Now, are there any general advice for how to set up a system with a NAS-unit running Subversion...

How to ignore specific Subversion subdirectories during commit

In the current project I am working in, someone decided that binary files be checked in as part of the source tree. The binaries live in a directory beneath the sources themselves: project/src # Here is the location of the source code project/src/more_src # Some more source code lives here project/src/bin # Here a...

What Visual Studio files should be ignored by subversion to eliminate or conflicts?

I am supporting a number of .Net developers who are using Subversion to version control their work, but we have been running into a number of issues that seem to revolve around the additional files that Visual Studio uses to manage projects, do debuging, etc. Specifically, it seems that these files are causing conflicts due to the fact t...

Tool to Compare/Analyze/Audit Different Versions of SVN Repository

I've been hired to audit multiple versions of a large application's source code repository. In particular, I want to verify whether certain components of newer versions of the system existed (or in some cases did not exist) in previous versions of the system. The company has been around for over a decade and there are about 60000 revisio...

After checking out Subversion code into Eclipse, how do I get it to build?

This problem has been frustrating me for some time... A lot of sites like Sourceforge use SVN or Subversion to manage their code. I have little problem compiling SVN code in C++, but when it comes to Java, my IDE gives me a headache. I've installed Subclipse for SVN support for Eclipse, and it works. I can check out any code into my Wo...

Wiki or CMS?

How do your store your company's accumulated internal knowledge? Meeting minutes, software specifications, plans, notes about other organisations, documents for discussion and storage, agendas... We're involved in software development but it's not our primary focus. So our wiki/CMS needs to be able to easily link to files in SVN and Tra...

Tips for manual merge of diverged code

I am fairly used to using svn for branching and merging, normally this works fine. However one component was worked on in two branches and basically took the component in different directions, so automatic merge won't work and using beyond compare shows the files as mostly different. I have tried to stitch together some of the files, bu...

Is it overkill to integrate Subversion in an application with a simple file archive?

As we're about to start planning an application that will handle media files (mp3, flv, pdf, images), I'm thinking about how to handle the file storage. The files will change and versions should be tracked to a degree, so integrating SVN in the app comes to mind. Now I wonder, is it too much? I'm quite sure we'll only use a fraction of ...

SVN Merge changes made on FTP into working copy

We manage our web development using SVN. On one project, we deployed the site by Exporting the project and FTPing it to the client sever. This client is hands on and has made changes to the code on the FTP. We're hired to add more functionality to the site now. How can I take the work that's been done on the FTP and merge it into my ...

SVN marks entire files as conflicted

I'm new to SVN. After working on a branch for a day or so, I attempted to merge changes from the trunk to the branch: svn merge svn://server/trunk The problem is that whenever SVN encounters a conflicting file, it's not able to recognize line by line changes and marks the entire line as conflicted. I experimented with several other S...

Weighing setup factors for subversion

I have a number of different projects, about 5, and a number of different developers, around 15, and some of the projects are in subversion and some are not. All of the developers are working on windows-based machines with TortoiseSVN, and the code of the projects is a mish-mash of classic asp, and asp.net. What is the best, as in most r...

How can I use FTP to update my website from a Subversion repository?

I spent some time looking for an efficient way to update my website from a svn repository, but all I can find is to "svn update" directly from the web server, or use a pre/post-commit hook. Since I don't have ssh access to my web server, I can't really use "svn update", so I tested a pre/post-commit hook (svn2web) which was practical, b...

TortoiseSVN Error

Hi all. I have some problems with SVN. Can anybody help me? When I tray to merge branch to trunk i get flowing error: Server sent unexpected return value (403 Forbidden) in response to OPTIONS Same error get when tray to create new tag or branch. I have Read/write permisions. I use VisualSVN and TortoiseSVN. Thanks ...

Practical RSA SecurID authentication with Subversion?

Has anyone setup Subversion with RSA SecurID authentication? Is there anyway to work around the constant re-prompting for authentication? ...

svn repository path changed: how to re-bind my local folder to it?

hello i have an repository that is visible as e:/svn/repository and it is checked out to a local folder c:/work Now repository path is changed to f:/general/svn/repository what svn command to use in order for c:/work to be bound to the new repository path? i do not want to delete c:/work and doing fresh check out since c:/work contains l...

Can SVN handle case sensitivity issues?

Is there a way to force SVN to be case insensitive? We have an issue where a user commits from a linux environment with files say "file.ext" and "File.ext". Works just fine. The problem, however, is when a user on a MAC OSX or Windows attempts an update/checkout. The two files are considered the same and the action fails in error. ...

Exporting a single project from SVN repository

I'm storing several projects under the same SVN repository. I've followed the manual and did this: I svnadmin dump c:\repository | svndumpfilter include > myproject.dump My problem is, svndumpfilter chokes with the error "Invalid copy source path" because we moved that particular project from branches back to another folder awhile ago....

Best branching strategy when doing continuous integration?

What is the best branching strategy to use when you want to do continuous integration? Release Branching - Unstable Trunk: or Feature Branching - Stable Trunk: Does it make sense to use both of these strategies together? As in, you branch for each release but you also branch for large features? Does one of these strategies mesh ...