Hi, I have a PHP project set up in Eclipse with SVN support. Now, Eclipse adds its project files .buildpath and .project to the project and Subclipse wants to add it to the repository. Now I could just use svn:ignore to let SVN ignore the files, but that's not an option for various reasons. So, is there a way to make Eclipse and Subcli...
I took over a software project and decided to put everything under SVN (on Assembla) using Tortoise SVN. The trunk is under ROOT. So the trunk contained the whole application (which I tagged 1.0). For my first big feature I created a feature branch named "dev". I could merge changes in the trunk branch into the dev branch without probl...
We have a machine on our lan and we check out of using tortoise subversion using svn://serverName/ e.g: svn://repoMachine/MainProject/trunk I have created another repository on the repoMachine in a foder D:\TestDataRepository using tortoise command . My question is how to I browse to this repository from another machine? When I type s...
I've managed to deploy my app to production using Capistrano, but I don't understand how to deal with my database. I'm using subversion and passenger. When I run cap deploy, the new deployment starts everything fresh. It wipes out the data that was added to the database. Obviously, there must be a solution, but I'm very surprised not...
I’m just wondering if anyone’s come across or could recommend an IDE that’s capable of the following: Key requirements: Save to two locations as a part of the normal save operation. (Local or network drive and a web server dev box.) Subversion integration (in addition to the above). Windows based Code highlighting (and ideally functio...
Basically, I have a project I've been working on for a while, and would like to push to the public as an open source project of one sort or another (to be determined, but out of scope of this question anyway). The question is, I've been using my own subversion repository locally to manage my code. Are there any hosts out there that wil...
My directory structure looks like the following: project/ app1/ app2/ settings.py From within the project directory, I ran svn propedit svn:ignore . This only ignore files from within project director excluding its sub-directories. I can run the svn ignore again from within each of the folder and it will work. Is there a...
I have a project which involves two other different projects. So normally, I would use svn:externals for this, but here the situation is a little different. I'm working with a particular CMS, which I have set up in a way that I can easily checkout the repository, add in some custom stuff and have a website using my "framework". But If I ...
Hi there, I have a post-commit hook that should update a working copy like this /usr/bin/svn update /home/xxxx/htdocs/devel That unfortunately fails. (subversion should run as www-data, as I'm using apache with it.) Trying this: su www-data env - /xxxx/hooks/post-commit /xxxx/$REPO $REV results in: Authentication realm: <svn://x...
I come from an SVN background so I'm not sure what the typical git workflow looks like. When you merge in SVN, you provide a commit message describing the merge. This is necessary because SVN's merge-tracking has historically been poor. I noticed that git's default behavior is to automatically commit the results of the merge if it is su...
I'm using Dreamhost's WordPress, Subversion, and Trac installations. My Subversion repositories are all in /repos/[projectname] and my Trac installations are all in /trac/[projectname]. I also have some other directories, such as /webapps/[appname] for web applications that I am working on. However, if I go to /trac/[projectname] in my b...
Can Xcode be used to develop in Client/Server environment. By that i mean, source code is in once location and multiple people can work on the same project without having to have multiple un-synced copies. Much like we can do with DreamWeaver. We establish sites and the source is in single location (server), and "clients" 1) lock the f...
I have a working copy that gets automatically committed into SVN overnight using a script. I use the SVN command line to do so. After a frustrating battle with Google, I have been unable to work out how to automatically add all unversioned files in the working copy to the repository before the commit. Does anyone know how I might go a...
I want to configure it so that svn diff filename shows the diff in beyond compare. I am on ubuntu. On a related note what is everyone using to diff and merge. BC is awesome on windows, but very ugly looking on Linux, imo. ...
I'm currently working on a framework for a client. The framework is based upon Zend Framework. The directory structure is: application : Application specific code application/modules/frontend : Application specific code application/modules/backend : Backend for MyFramework library/MyFramework : The custom...
Is there a single server I can use to store/manage repositories which could then be accessed by the common/modern open-source (D)VCSs such as SVN, Git, Mercurial, bzr, etc and still keep a good level of compatibility with all of them? We have a large number of users on SVN, some on Git, and a couple using mercurial but none are using an...
I'm working on a relatively new project using Subversion. I've already branched off a couple of times and merged that branch back to trunk with no problems. However, my latest merge is failing - and it seems to be tied into the fact that I added a new file to the branch that does not yet exist on the trunk (in this case, GradientView.h)....
I'm trying to create and follow best practices for versioning control and came across a reference to atomic commits in subversion. Since I've never heard of this action, I have a few questions about it. What's its purpose? When should it be used? How is it different than a normal commit? Is it available to TortoiseSVN users? If so, h...
I have a couple of projects hosted on Codeplex. Since I didn't really have a clue about anything but TFS when I created them, I used that. But, now I have gotten more comfortable with TortoiseSVN and VisualSVN so I would like to use that instead. Of course, to get my project using subversion is no problem. The thing is that the projects...
At my company, we develop our ASP.NET applications as websites and often just work off of our network drive, which points directly to the files on our development web server. Our code is compiled at time of HTML request, so we don't build our web applications. I've read that automated builds are a best-practice, and aim to set that up as...