version-control

Project Management + SCM for techies and non-techies?

Hello, I've recently begun evaluating a few project management projects for the company I work for. It's the classic case - growing company looking for the right solution (meaning, free or really cheap). It's a combination shop - Windows, Macs, and Linux on the desktop. The tech savviness, of course, ranges from newbie to unix guru. ...

Licensed 3rd party Tool in Version Control

How do you stored 3rd party libraries in source control? The problem I have is that I can't checkout the source and compile it on just any computer, it has to be the one computer that I installed the library. Any suggestions? ...

How can I force subversion to commit an unchanged file?

I want subversion to commit a file even if it's unchanged. Is there a way to do this? ...

Managing Branded Software in Version Control

I'm currently using subversion to manage my source code and I've come to a point where I need to brand the software I'm working on for a client. All the branding is handled in the project resources so changing the look for a client is very simple. What I'm running into a problem with is maintaining the branded version of the software in ...

Rollback a changeset from the command-line only in TFS?

Hi All, I'm building an automated promotion utility for TFS. One of the features I'd like to support is rolling back the latest change. I'm quite aware of the Rollback Power Tool, but my understanding is that even if you pass a changeset in through the command line, it still brings up the GUI interface for other operations. My thought ...

Moving directories in subversion

I have inherited a subversion repo which looks like this: https://foo/product/src I want to make it more like: https://foo/product/trunk/src https://foo/product/tags https://foo/product/branches Will moving ./src to ./trunk/src retain history ? I also want to make sure the other developers don't curse me for doing this .. are ther...

How to keep your own debug lines without checking them in?

When working on some code, I add extra debug logging of some kind to make it easier for me to trace the state and values that I care about for this particular fix. But if I would check this in into the source code repository, my colleagues would get angry on me for polluting the Log output and polluting the code. So how do I locally ke...

Has anyone tried Divmod's "Ultimate Quality Development System"?

Ultimate Quality Development System Does anyone have any experience with this or a similar methodology, good or bad? ...

What is the best way to roll-back a change set using Subversion?

I've been using various source control systems for a while, but when it comes to reverting changes I'm not yet an expert. Can someone help given this scenario: Scenario Given a bug was introduced in revision #5 And 3 files were changed in revision #5 And changes in 2 files were responsible for the bug When the customer discovers the b...

git svn rebase: Incomplete data: Delta source ended unexpectedly

I have been maintaining the git mirror of the watir project. Some time a couple weeks ago, we had someone ready to submit their first git-based patch. Unfortunately, we ran into some issues regarding line endings (CRLF vs. LF, etc.) because of the multi-platform nature of the project. I tried what I could to set the autocrlf option (t...

Using svn and .NET Winforms - Building Install Files Deletes _svn Folders

Does anyone know how to build an install project without it deleting/overwriting the _svn folders? I have a VB .NET 2005 Winform Application and each time I do an Installer Build, it deletes/overwrites the _svn folder in the directories. How can I stop this from happening? Any and all help is appreciated! Thanks! JFV ...

Placing a Sharepoint Site under version control

Working with Mircosoft Office Sharepoint Server 2007 (standard edition) what is the best way to place a site collection being developed under version control? We're using Subversion for all our other (non-sharepoint) projects but I'm just not sure how to approach MOSS. What needs to be placed under version control to ensure we have eve...

"There appears to be a discrepancy between the solution's source control ...."

We get this error in Visual Studio 2005 and TFS very often. Can anyone help us pinpoint the cause for this message? The full message is: There appears to be a discrepancy between the solution's source control information about some project(s) and the information in the project file(s). To resolve this discrepancy it will be necessary...

Best version control system for a non-networked environment?

I am mentoring the programming group of a high school robotics team. I would like to set up a source control repository to avoid the mess of manually copying directories for sharing/backups and merging these by hand. The build location will not usually have network access, so this has led me to distributed version control systems (DVCS...

Import legacy project (dated series of folders) into Subversion

Hi, Does anyone know of an easy way to import a legacy project, whose "version control system" is a series of dated folders, into SVN, so that the history of the revisions is preserved? The project I inherited was not under version control, and there are hundreds of folders, each dated like: 2006-11-26, 2006-11-27, etc... Thankfully i...

What are some arguments against using Continuous Integration?

I can think of plenty of good reasons to using it; however, what are the downsides to it? (Apart from buying another server) What are some advantages to using a daily build instead of it? ...

How do I reset/revert a specific file to a specific revision using Git?

I have made some changes to a file which has been committed in a few times as part of a group of files, but now want to reset/revert the changes on it back to a previous version. I have done a git log along with a git diff to find the revision I need, but just have no idea how to get the file back to its former state in the past. Any ...

Any Notepad++ plugins to automatically save document versions

Hello, Does anyone know of any notepad++ plugin that saves a version of whatever I'm working on periodically? Ideally, it would save many versions with the automatic version number and the date in the title, and perhaps store them in a zipped archive to save space. Does something like this exist already, or shold I attempt to write suc...

How do I get a list of all unversioned files from svn?

Sometimes youre developing and you decide to commit, forgetting you created a few files on your project. Then a few days down the line your buddy gets your build out of subversion and complains that some files appear to be missing. You realize, ah crap, I forgot to add those files! How can I get a list of the files that are not under ve...

How do you maintain development code and production code?

What are the best practices and rules-of-thumb to follow while maintaining code? Is it good practice to have only the production ready code in the development branch, or should untested latest code be available in the development branch? How do you guys maintain your development code and production code? Edit - Supplementary question ...