I have a Visual Studio 2008 Solution where the main output exe is a VB.Net Winforms exe which has several VB.Net and C# dll's linked from the same solution. The whole solution is under version control with subversion. Now I want to automagically update by generated files with the current svn revision number. For this purpose I found thi...
Hi, I'm trying to deploy an app with SVN and Vlad the deployer. Vlad and its dependencies are installed and seem OK. I'm trying the following: rake prod vlad:update Being my config/deploy.rb file: task :prod do set :application, "xxx" set :deploy_timestamped, "false" set :user, "username" set :scm_user, "scmusername" set :re...
We created a branch from the trunk on which a major refactoring was done. Meanwhile, the trunk advanced a few revisions with some fixes. We don't want these changes on the branch, so we don't want to "catch-up" merge the trunk to the branch, because we don't want to mix the old and new code. But without this I can't reintegrate the branc...
How can I keep IDE configuration files out of a (svn) repository? The only way I can think of is with very specific "add" and "commit" commands. ...
I created a branch from my SVN trunk. In the branch, another developer deleted a directory, but then readded it with the same files. When I merged the changes from the branch back into the trunk (using TortoiseSVN), this directory had a "replace into" message. I unfortunately merged those in (none of these files in the branch had chan...
Here is the scenario: Windows Vista environment. SVN version 1.6.11. I'm on my branch directory. I want to update my branch with a particular change from my trunk. Using command line (using SlikSVN) I enter the following and it returns nothing (returns a blank line and no merge occurs): svn merge -r 11846:11891 http://trunk//AppConstan...
Hello Everyone, I have been using Subversion for about 2 years to manage a large C# project. On a recent Subversion update, a number of new folders were added to my source code folder: \conf \db \locks \hooks 35+ files were also added during the update, all appearing under the 4 new folders. I haven't changed any client (I use Tort...
I use SVN from Collabnet, 1.6.9 version. I tried to separate my project on two parts with SvnDumpFilter and encountered an error because some folders (includeing the one I want to separate) had been moved. Then I googled that SvnDumpFilter 2 and 3 can solve this problem. I tried to use them but in both cases encountered an error: Error p...
Until now, I was always working on my own for PHP-projects, but at the moment I'm working in a small team (2-3) persons on those projects. Accidently, we did some overwriting of work from the others ... To prevent this, we thought of setting up a SVN-repository, so at least every version is stored in a safe place. Technically, the SVN i...
I've just changed jobs. My previous employer uses Subversion, my new employer uses Perforce. Are there any resources out there that'll help me, as a user, change my mental model from a Subversion one to a Perforce one? What are the analogs to common SVN commands? Which concepts are implemented differently? I'm not particularly interest...
Hi. What can I do to import a SVN repository into git but only from a (known) revision number and onwards? I've tried with: git svn clone --authors-file=/home/ubuntu/svn-git-users.lst --revision=4151 -T trunk -b branch -t tags file://`pwd`/../svn-server-sync/MyRepo MyRepo But it fails with: r4151 = e80c7c5923700d6c7594c91f1727...
I use a script for my homepage but I'd like to localize it. Furthermore the CSS uses images from a special folder which does not fit to my folder hierarchy. Because I don't want to adopt these paths and settings I'll have to modify the original sources. Currently my repository looks like this: /3rdParty /CompanyA /Com...
Here's my setup... Laptop (Mac) - git clone of svn repository Thumb drive - git clone of laptop git repository Server (Win Server 08) - git clone of thumb drive repository I'm having trouble keeping them in sync for some reason... If I make a change on the server, I'll do a "git pull " on the thumb drive to get the changes. Take th...
When running the commandsvn ci you get a text editor that allows you to place a comment, below that is there is the text "--This line, and those below, will be ignored--", then the files modified, added, or deleted. If I were to delete a line such as: M folderA/fileA Would it remove that file from the check in, or is that just an SVN ...
I have been working on a project for some time, and it has branched off into several different versions. All versions have some common code base, and each version has specific functionality that is unique, and each version will need to be supported individually. What SVN structure would you recommend? Right now I am using a separate rep...
I had a boss, past-tense, who decided to put svn branches in the same folder as trunk. Normally, this wouldn't affect me that much but since I'm using git-svn things are going so well. After I did a fetch it created a folder for each branch in my root folder so I have three folders, drupal, trunk, and client. The drupal folder is git's m...
I'm setting up a repository for me and some colleagues. I have a subversion repository at hand, and all required rights. The usual directory-skeleton has been set up for me (branches, tags and trunk). Now I'm about to create a directory for me and my colleagues to put our files in. I'm quite sure the right place to put it is in trunk. ...
Hi All, I am setting up a Continuous Integration server. I have one issue that doesn't seem to be mentioned in the tutorials. I have a ASP.net Web Application that I need to compile and them publish. My Problem is that I seem to be able to compile the app but when I attempt to use a buildPublisher this copies every thing including .s...
At work, we are using SVN, CVS, and GIT because there any many projects that were started at various times. Anyway, a common sequence that occurs is as follows: Working on task A, making changes to project Has new task B, some bug or functionality needs to be done on project, independent of task A but may affect same set of files Check...
Hi, I'm currently trying to convince my company to migrate to git from subversion, and one thing that would be really helpful would be to allow me to store a repository in subversion and git at the same time (then I can show them how easy it is to do in git what they've spent an hour trying to do in subversion). I guess that I could put...