svn

How to correctly preserve branch/merge history of an SVN repository when migrating to GIT

Hi everyone, I'm trying to migrate a small SVN repository w/ 2000+ revs with 10+ branches to GIT. Branches sometimes merge contents from other branches. My main choice, was obvisously to use: git svn clone -s URL However, my GIT history only preserved the branching information and never shows a merge. Having an hard time googling for...

Managing Rails Migrations for different branches on the same machine

I'm a one-man-band at the company I work for. I develop a Rails application for internal use within the company. Since the beginning of the project I have used SVN for source control and done most, but not all, development in trunk. Occasionally, when I have had very significant changes to make, I have branched and made the changes mergi...

IIS7 and ARR as reverse proxy for Subversion

I am using IIS7 and the Application Request Routing extension to act as a reverse proxy to Subversion running on Apache. The proxy works fine and I am able to explore the server, and even perform a "check out". However, I cannot browse to files that would normally be forbidden by ASP.NET - for example, .cs, .csproj, and so on. Files AS...

How does bug tracker/version control integration work with typical git workflows?

Here's are examples of git workflows: http://wiki.github.com/bard/sameplace/typical-git-workflow http://www.nabble.com/Git-workflow-overview-td16340337.html http://osteele.com/archives/2008/05/my-git-workflow Let's say you wanted to take advantage of bug tracker integration with your version control system. Where/how would that f...

Subversion repository has a small file size compared to working copy!?

Hi there, I'm using Versions app on a mac to handle a SVN repository for my files. My working copy is around 6MB yet my repository is only 1.4MB, and I am holding 5 revisions in the repository! How can this be? Mike ...

Is it possible to change dir name in repository by svndumpfilter?

Is it possible to rename directory in svn repository. Not create new revision in which this directory will be renamed. I would like to change the name of this directory starting from the first revision. As far as I understand svndumpfilter utility can be used for this. Is it correct? Does anyone can give me small example how to do i...

How can I create directories using subversion version numbers in gnu make?

Thanks to 'Beta' my solution: RLS_DIRECTORY = $(shell svnversion -cn | sed 's/:/-/') SVN_VERSION = $(shell svnversion -cn | sed -r 's/.+://') RELEASE_NOTES = $(RLS_DIRECTORY:=/release-notes-$(SVN_VERSION:=.txt)) -include svn-version.mk SVN_OLD_VERSION ?= 0 .PHONY = all zip release release: $(RELEASE_NOTES) $(RLS_DIRECTORY): m...

Windows software to browse SVN repository that isn't TortoiseSVN?

Because of an unfortunate Windows limitation (no more than 16 icon overlays in Windows Explorer) TortoiseSVN is not a viable client for me on computers with the TFS shell extension installed. I've spent some time browsing wikipedia page, but there is a lot of crap on that list. QSvn was close but doesn't let you browse before doing a che...

Committing single change in SVN

Is it possible to commit a single change to SVN without committing any of the other changes in the file? For example, I have a file, config.properties, source controlled under SVN, and my local copy of this file contains numerous changes that are only relevant to my local environment. However, I want to commit a new config entry to this...

Deploy ASP.NET app to remote server

I am looking for a solution to deploy ASP.NET application from SVN in one server to other remote web server. FTP is not allowed. Other tasks than file copy should be done - e.g. create virtual directory. Which tools would you use? Remote server could have MSBuild or NAnt installed but how to securely copy files from SVN server to web se...

Forking on Google Code (or any other SVN hosting)

Sites like github, bitbucket provides an excellent/useful feature of "forking" projects. This allows one to simply fork a project and work on their desired features (before submitting it to the projector owner and getting commit access). How is this workflow best achieved for SVN projects (especially the various ones hosted on Google Co...

how to configure a http proxy for svn

Hi Guys, I want to check code from the repository http://code.sixapart.com/svn/perlbal/ . I can only access the the repository url by setting a proxy . I guess if i want to get the code from the same url by svn I need to configure a proxy too . so does anyone of you could tell me how to configure a http proxy in svn ? by the way, I ...

Exclude .svn directories from grep

When I grep my Subversion working copy directory, the results include a lot of files from the .svn directories. Is it possible to recursively grep a directory, but exclude all results from .svn directories? ...

how do I manage source code using SVN? branching, merging.

We are team of 4 developers/friends located in different locations. We all have started working on the a ProjectX and created branches A, B, C and D using Subversion. we have just basic knowledge of version controlling the source code. Other day one of us just tried to merge Branch A with B,C, and D and B tried to merge with A, C, and D...

Subversion Repository Autocomplete

Hey Guys, When entering something like svn checkout file:///var/svn/repos/my-projects I can use to autocomplete up to repos/ but after that I can't. I know that Subversion's files in the repository don't mirror a standard directory structure so that is probably the reason. However, if I'm checking out just one file its a pain to tr...

Credentials ignored with maven scmchangelog-plugin

When I configure the scmchangelog-plugin, as written in the examples/tutorial, and run the site-generation, the username and password I have set are ignored. The documentation says that username and password which should be used to access the SCM can be configured in the plugin-configuration. This looks like this: <reporting> <plugins...

Work with Subversion from USB Key

I am taking some work home with me these days and I transport it on a USB key because my work is on a private intranet. I am using Visual Studio 2008 and I find that the performance of builds is degraded by working off the the key. My initial thought to improve performance is to use Robocopy to mirror the directory locally and then whe...

TortoiseSVN and Putty problems

Hi - here is the situation: successfully installed svnserver on a NAS drive accessible by LAN using this tutorial: http://forum.synology.com/wiki/index.php/Step-by-step%5Fguide%5Fto%5Finstalling%5FSubversion%5Fon%5FARM-based%5FSynology%5FProducts The svn base directory is called svn, and the repo (dummy-name: repo_name) is inside svn....

SVN to git ... now git to SVN. So many conflicts ...

Disclaimer: Things would be simpler had I known about git-svn at the start. I had a large codebase in SVN, and crudely got it situated in git. Work life was very painful without fast, efficient branching, so this was all accomplished in a bit of a rush. My process was: svn export git init . git add . git commit -a -m "initial commit"...

Subversion management of project configuration files

What is best practice for using subversion (SVN) for managing a project that requires a single configuration file that has multiple concurrent versions for different environments. I.e. Project ABC is used for three different environments, that use the same code, except for a slightly modified configuration file. AND Project ABC is al...