version-control

Current state of Git support in Eclipse

What's the current state of Git support in Eclipse? The EGit downloads page looks empty. I'd like to give Git a try for a new project, but I need to know how well it works with Eclipse right now. If it's likely to cause huge pain I'd rather stick with Subversion. Anybody out there happily using Git and Eclipse? Anybody who tried it rec...

Keeping all Visual Studio projects in sync with a library

Scenario I have a Library that contains Projects A, B, and C. I have two solutions. Solution 1 includes a copy of Project A, and Solution 2 includes a copy of Projects A and B. When I build Solution 1, here's what should happen: When I build Solution 2, here's what should happen: How can I do this? Is this something I cou...

Settingup SCM using Xcode and SVN (Subversion)

Hi all, I'm trying to setup Xcode SCM using Subversion (SVN) on a network disk (mounted). I was able to setup SVN repository on my machine locally, and everything worked smoothly without any hassle. Reference Article: Version Control is Your Friend by Jeff LaMarche My problem is that I'm unable to set-up SVN on a network drive (mounted...

Installing SVN on Mac OS X 10.4 and accessing it using svn+ssh:// URL

I wanted to setup SVN repository on a network machine running Mac OSX 10.4. I downloaded and installed subversion from HERE. I installed the package, and in order to call the Subversion commands from every directory, i followed the following instructions: Open Terminal. Enter following command. $ pico .bash_profile Add the followin...

When making a branch in TortoiseSVN, what do "head", "working copy", and "specific" revisions mean?

A new user of Tortoise SVN, working over source control. I have a Visual Studio solution which consists of 5 webAppliation projects. I need to take one out and work over it in a branch. When I try to branch it, It is asking me of one of these options head revision in repository specific revision in repository working copy revision ...

Why would anyone create an issue via commit log?

I was studying SCM/Bug tracker integration when I found that it is not only possible to close and modify issues from the commit log, but it is also possible to create them. But since the commit log is for code changes, I don't see why anyone would modify the code to create an issue. Please cite one scenario where this is justifiable. ...

Mercurial Subrepos - How do you create them and how do they work?

Situation I have two .NET solutions (Foo and Bar) and a common library that contains ProjectA, ProjectB, and ProjectC. Foo and Bar reference one or more library projects, but the library projects are not located within the Foo and Bar Solution folders. Directory structure: -- My Documents* -- Development -- Libraries ...

How should I handle website config files when importing a site into a SVN repository?

I'm starting to use SVN repositories for all of our websites and wanted to know what the best practise was regarding website config files. Should they be stored in the repository? The problem is the configuration of the websites need to be different for the working copies than that of the live sites. If I edit the config file for a work...

conflicting Dlls

Hi, Iam getting following error when iam using 'System.Net.HttpStatusCode' in my wcf project. The type 'System.Net.HttpStatusCode' exists in both 'C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\System.dll' and 'D:\HKMP\Branch\NewAmelio\amelioSL\Web\Services\bin\System.Net.dll' HttpResponseMessageProperty property = new HttpResponseMe...

Should a website's images folder and images be stored in SVN repository?

I'm currently importing all of our PHP websites into SVN repositories. Each site has a images folder which contains all the sites images. The images are updated quite frequently as most of them are offer graphics. Should the images (binaries) be stored in the repository? The other issue is that they are updated all the time. How would...

Is there a way when creating new SVN repositories for the client (tortoisesvn) to create the branches, tags and trunk folders automaticlly?

I'm using tortoisesvn to create the repositories and wondered if there was a way it could automatically create a skeleton directory structure within the repository? I need this as I'm going to allow other people in the team to set-up new repositories and I need to make it as simple as possible and minimise mistakes. I would like the tag...

Fastest way to "reset" Mercurial repository to Version X (without cloning)

Let's say I clone a remote Mercurial repository (over the local network or even over the Internet) to try something out. I work in my clone, make a few commits...and then I realize that my changes don't make sense and I have to start over again. So I want to have a "fresh" clone again, from the same source repository. Basically, I want ...

Am unable to perform an SVN update on a working copy in Linux getting "Unable to open an ra_local session to URL" error.

I have a Linux server which contains 10 repositories. I have setup a samba share to allow easy access to the repository directory so that I can create repositories via Windows using tortoisesvn's Create repository here command.... The problem is that the repositories were setup using the Windows file:/// paths and not the HTTP ones usin...

keeping Eclipse-generated makefiles in the version control - any issues to expect?

we work under Linux/Eclipse/C++ using Eclipse's "native" C++ projects (.cproject). the system comprises from several C++ projects all kept under svn version control, using integrated subclipse plugin. we want to have a script that would checkout, compile and package the system, without us needing to drive this process manually from ecl...

Ruby version control

Hi, Developing on a Mac and will host on Linux. Does any know of a good/reliable version control plugin or hosting platform I can us during development? Thanks, Eric ...

Project templates Eclipse / Java

Hi, I am researching possibilities to create "project templates" for the kind of projects my team is working on (Embedded Java). We want to make it trivial for a new developer to not mess up creating a new project. All the tools we use in our team should be pr The basic idea is that there should be one command to set up a project and I...

What happens if a file I want to commit to SVN is updated so often I don't manage to do a merge quickly enough?

Consider a situation. I want to commit a changed file to SVN and see that someone else committed the same file after I checked it out, so I have to "update" and merge changes. While I'm doing that someone commits the same file again, so when I try to commit the merged file I have to update again. Now if other users commit often enough i...

How do I revert a file in a working copy to an older revision and then commit it back to the repository?

What is the process for reverting files and folders to earlier revision in SVN using the windows TortoiseSVN client? I've have tried right-clicking a file in the working copy and selecting the "Update to revision..." command and then specifying the revision number I want, but I can't commit that change back to the repository as it think...

Authentication error on execution of post-commit hook in SVN

I've got a SVN post-commit hook that updates a working copy when a commit is made to the repository. The post-commit hook executes the following command: /usr/bin/svn update /path/to/working/copy It was working fine until I enabled the Apache mod_dav Require valid-user directive. Authentication is fine when using the tortoisesvn clien...

How can we use version control in a shared work environment?

Currently our team (web devs, one designer and one copywriter) all work on separate workstations but do our changes on the same dev environment (we all mount the same shared drive), it's a marketing site and not a web application, so no builds or deployments, we just push changes to the live site once they are done, but I think it's impo...