version-control

Source Control System for Pivotal CRM

We manage a multi-locale, multi-language Pivotal CRM System with developers spread across UK and India. We do not have any Source Control System to manage the development work. Is there any source control system that we can integrate with Pivotal CRM. Note: "Please check with the providers CDC Software" is not a valid answer :-) ...

Best practices for IntelliJ IDEA 9 + Maven + Version control

The project is using Maven so the POM files are the main sources of project info. There are some useful settings in the project files which would be nice to keep. OTOH IDEA seems to create too many redundant changes in the project file structure which pollutes the SVN history and sometimes creates conflicts. Should I keep the .idea di...

SVN commit fails beacuse I did not check out.

I have some source code and I imported it into SVN. I forgot to update or check out it and made some changes to the files. Now (understandably) SVN does not allow me to commit these changes. It says: svn: '/home/name/folder' is not a working copy What can I do now to commit these changes? ...

Log messages for revision control by yourself

I use version control extensively. When I'm working by myself, I still use it, and find many good things about it. I know I'm 'supposed' to put in good messages etc, but find that usually the date of a commit and all the tools for checking diffs etc are enough. I often end up putting in junk messages like 'changes'. I guess this is a we...

How do I prevent SVN from caching credentials for a single repository?

I'm using Collabnet SVN client versions 1.5 & 1.6. My local machine is running Windows Vista x64 (I know, very sad indeed). I would like to force authentication every time I try to perform any subversion operations on a selected repository. How might I set a property or setting to require authentication every time? Thanks for the help an...

Is there an open-source, web-based, self-hosted, revision control system?

Not something like Gitweb because you can only BROWSE and not actually check out/in files. I'm thinking of something like Visual SourceSafe, but web-based, and open-source, that you can host yourself. Trac might be closer to what I'm looking for, but I've heard bad things about it. Any other options? EDIT: I'm working on a PHP / MyS...

How do I undo a bzr ignore?

I mistakenly did bzr ignore For some files that I don't want to ignore. How do I undo the ignore? ...

Limited user premissions in team foundation server

Can I setup Team Foundation Server in such a manner that every uer have only access to some source code files? ...

How to relocate our source code from Vista running VisualSVN Server to Windows 7 running VisualSVN Server?

[i meant to ask this question on StackOverflow...] I have been using VisualSVN Server without any problem on Vista. When it is time to change everything to Windows 7, I wonder what's the best way to do that? Is it best to "check in" all the code from all machines onto the Vista, and do an SVN Update for one machine, and then reinstall...

How to do version control via ftp?

I have a web dev. client using a shared host that doesn't allow shell access, and thus no access to SVN, Git, etc. I've tried to convince him to move to one of the many cheap options that allow it, but he won't do it. If I use version control on my staging server, are there any tools that will allow me to replicate the changes to product...

How to manage multiple clients with slightly different business rules?

We have written a software package for a particular niche industry. This package has been pretty successful, to the extent that we have signed up several different clients in the industry, who use us as a hosted solution provider, and many others are knocking on our doors. If we achieve the kind of success that we're aiming for, we wil...

version control: free one for visual studio express

I am using c# express and would like to use a free version control system. Please share your recommendations. ...

Version Control for non-programmers

Can someone recommend a version control engine + GUI that will be good for non-technical users? I'm perfectly fine with using Subversion with my team of developers, but I want to find something that will help the rest of our company. We are a design firm that deal with these type of files: Photoshop, Vectorworks, Microsoft Office, PDFs,...

Version control; choices, choices, choices!

Our setup as follows: We have a local development server running Ubuntu, with a setup to mirror that of our live host. Each developer works on a Windows machine and accesses the files from the local dev server. The projects in question are a number of websites built in PHP. Seeing as there are no good reasons not to use version control...

Execute Maven plugin goal on parent module, but not on children

We have a multi-module maven project that uses a profile that defines a buildnumber-maven-plugin to increment a build number and then check it into source control. If I define the plugin in the parent pom.xml it executes for all the child builds as well. Here's my parent pom.xml <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns...

How to handle unmergeable files in a version control system?

I am working in a model-driven environment, where Java code is generated from a MagicDraw model by AndroMDA. The models are developed iteratively, hence we would have to merge them if we create branches. But as I was told the models cannot be merged, because every time it is saved every id of every element will be replaced. But I want t...

Files to ignore when using Visual Studio with Git

I've installed Git to do some development using Visual Studio 2008. Most of the work will be new development but we do have some old projects from prior to VS2005 that I want to bring over into the new repository. There is an existing thread about general VS/Git integration but my question is limited to the .gitignore file and Visual St...

Version Control with Google Docs Best Practices?

From a quick perusal, it seems that Google Docs does not support version control the way git or svn does. My question is: If I want to store all my documents on Google Docs, what is the best way to make them be capable of branch/merge type version control? What would this require? Or what is the workflow you use to store your familie...

Best solution for integrated bug tracking, wiki and version control

I love the Google Project Hosting web app. It includes bug tracking, wiki and SCM in one interface. (Example: WMD Editor) This solution is closed source and not for sale. While searching similar solutions I found Trac which has a rougher interface. Could you list similar solutions? Someone asked the same question, but specified Git as...

Subversion: Merging a vendor's source code releases into mainline at regular intervals

At regular intervals, I receive a new release of a vendor's software, delivered as source code in a compressed package, and I don't have access to the vendor's source code repository. We make changes to the vendor's source code between their releases. Our changes do not get incorporated into their releases, but I need to merge changes ...