version-control

Mercurial: Merging one file between branches in one repo

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged? Is it possible to merge only certain files, instead of whole changeset? ...

TFS and Source Control Explorer

In TFS 2005, and when you open from the client side (from VSTS) the source control explorer, and you create a workspace. Where the data of that workspace is stored? and is there a command line to get all workspaces and their information? Thanks ...

SCM/VCS: Tracking directories

When I first found out that Mercurial tracked files and not directories, I was a bit disappointed. (This means you can't represent an empty directory in the repo.) However, it doesn't seem to be an issue in practice, and makes some things a tad easier for me. How about other SCM systems? (Edit this post to add them.) What advantages...

Are there any good graphical git and hg/Mercurial clients on Mac OS X?

I'm searching for compelling git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in ruby or tcl/tk, which IMO aren't good OSX citizens in regard of integration in the OS. I've clients in mind similar to Versions.app or Cornetstone which are...

Transferring changes from a dev DB to a production DB

Say I have a website and a database of that website hosted locally on my computer (for development) and another database hosted (for production)...ie first I do the changes on the dev db and then I do the changes to the prod DB. What is the best way to transfer the changes that I did on the local database to the hosted database? If it...

SVN: Track merges

Is it possible in SVN 1.6 to track where a commit was merged. I'm especially interesting in UI based solution (Eclipse plugin will be great). ...

Version control Access 2007 database and application

I need to version control a Microsoft Access 2007 database and application. Currently everything is contained in a single mdb file. The application includes: Forms VBA code Actual database I would assume I need to separate the database from the forms/code. I would like to be able to version control the forms/code as text to support ...

Is there a way to detach a project from CVS in Xcode?

XCode's CVS support is abysmally bad. Or maybe it's just the server in my organization. Either way, it's leading to more headaches than it's worth so I'd like to "detatch" the project as I can in Eclipse. Is there an easy way to do this or do I have to manually delete all of the CVS files? ...

How should I support and continue development on a forked application?

We have a large application that runs at roughly 5 locations. None of these locations are running the same version of the application. This makes patching and updating very complicated. Try to follow this example: We'll call the application I'm talking about "application A". Now we want to roll out an application B to one of these locat...

Team Foundation Server - Sql Server Version Management

Does TFS offer any enhanced ways of storing changes made to a sql server database other than using it to version text files of sql statements executed on the database? Or is the functionality I'm looking for only available in 3rd party tools like Red Gate's tools or Quest's Change Director? ...

What is the best way to version a file that you want to get once but don't want to commit changes after the first get.

Hello, I use subversion with TortoiseSVN on projects at work and my personal ones. I was wondering what is considered best practice in terms of being able to setup your repo so that doing a SVN Checkout and VisualSVN for Visual Studio will get you all that you need to compile ... but I want to be able to mark certain files so that t...

undefined error when calling function from another js sourcefile

Hello, I have a question that concerns calling a function within another js sourcefile. I declared the sourcefile before the file with the function that calls that particular function. I thought this would work, but it gives an undefined error. I also have a function in a file that calls a function in a later declared sourcefile. Tha...

VSS alternatives for non coders to share excel files etc?

I need to find an open source alternative to VSS where people will share things like Excel sheets,PPT etc. It will be used by extremely non technical people on windows, so I have ruled out SVN,CVS,GIT etc. I need simple checkin and checkout system for stuff like Excel sheets. Can people suggest something from open source?? ...

Simple single user revision control

Hi, I work alone on various pet projects. I program them in different places (at home, at work..). I'd like the simples tool to help my workflow, something in between a basic revision control system and a sync tool. For this small projects I just work on different directories (for versions) and email myself zips (for syncing the work d...

Are there any database implementations which keep all history?

Using a version control system for your source code (like subversion) makes sense because it allows you to back out of mistakes, audit changes, make painless snapshots, discover exactly where something went wrong so that you can improve your process etc. For the same reasons it makes sense to do change tracking of business data, and many...

I keep on getting "save operation failure" after any change on my XCode Data Model

I started using Core Data for iPhone development. I started out by creating a very simple entity (called Evaluation) with just one string property (called evaluationTopic). I had following code for inserting a fresh string: (void)insertNewObject { // Create a new instance of the entity managed by the fetched results controller. NSMana...

What comes after distributed version control?

First there was a centralized model of version control (cvs, svn) and recently a distributed version control model was created (git, bzr, hg). Are there any other types of version control ideologies out there? Or what will be the next new one? ...

Checkin CruiseControl.net config file

Is there any cruisecontrol.net extension, that monitor the event when the config file modified, and will check-in the config file into the source control? I found on the cruise-control documentation a method that does the opposite, which is when we modify the config file in the source control, cruise-control will update the file and app...

Source Control with Visual Studio Integration (Preferably free)

We've been using Visual Source Safe 6.0d for quite some time now, and it has served us well. However, upon attempting to upgrade to SourceSafe 2005, we discovered that it costs an arm and a leg! Additionally, it does not appear to be a painless upgrade. That said, we want a different solution that costs less money (preferrably free). ...

Back to revision in Subversion

Hi, suppose you update your code to revision 10 which is broken. You want to go back to revision 9, work on the code and wait until someone will fix the build. How? svn merge -rHEAD:9 . won't work. You know why ;). Thanks in advance, Etam. ...