version-control

Can I get GIT style branch visualisations from Team Foundation Server (TFS)?

Hi, As an avid user of GIT, I've come to absolutely love its branch support, in particular being able to visualise all the branches in a repository over time. Unfortunately though we have a requirement to use TFS, but I know it has some strong visualisation features. I know you can visualise 'ChangeSets', but as far as I'm aware, this...

Maintaining .NET assembly references common to multiple projects

Hey all, My colleagues and I have been wondering the best way to do this for quite some time: what's a good/standard way to maintain .NET assemblies that are referenced in multiple projects? I'll elaborate a little bit: Say you have projects A, B, and C. They could be in the same solution or different solutions, doesn't really matter. ...

What's the best way to version control graphical assets on Windows?

I'm a web developer / designer, and I want to be able to version control graphic files (Photoshop / Fireworks / Illustrator / Stock Photos / etc). This would normally be fine but some of the files I have tip the scales at around 800MB, which TortoiseHG chokes on. I currently have a server I put all my files on so all my computers can ac...

Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'?

I am trying to merge a Branch to Trunk using the TSVN 'Reintegrate a branch' feature. However I get the following error. Error: Retrieval of mergeinfo unsupported by 'svn://IP.Address'? What is the reason for this error? Also is there some other way to merge the Branch to the Trunk. ...

Version Controlling Database that is used by multiple projects

Hi Everyone, I'm currently working on a project that has several 'Visual Studio Solutions'. One is for the main application and the others are component-based projects which will be reused in other applications. The problem is that all three solutions need to access data from the same database. Each component has its own set of views...

What are the limitations of Git on Windows?

Everywhere I read about Mercurial and Git they generally throw in a line or two which implies Git has limited ability on Windows (because of some Shell scrips cannot be ported, etc.) but I've never come across some page which explicitly mentions them. And most pages are a tad old. What are the limitations of Git on Windows in terms of f...

Source control/ASP.NET MVC 2 maintenance - from Win7 laptop to IIS7 production server

First, I'm not sure if I should break this question into smaller, individual questions. They're related, but I'm not sure if I'm doing it wrong. Apologies if I am. I'm a bit new to the idea of source/version control. I have installed TortoiseSVN on my development laptop, but haven't really gotten into the habit of using it. That sai...

How to develop against a web-based product with built-in server (not ASP.NET project)?

Hi, We have an application at work which is web-based and comes with a bundled web server (Apache tomcat), and is for network monitoring/patch management. It allows for personalisation, all sorts of rules, custom UI design using proprietary components and definition language, and even custom code to fire on events (based on Java). I am...

Source control options for personal projects

This may prove OTT for the level of usage it'd get, but.... I'm working on some personal projects in Visual Studio Express at home. I've got a big desktop replacement laptop and a little ultraportable, both of which have been used quite happily for development, and a spare XP Home box running as a de facto home server. I'd like to be ...

A good way to manage cryptographic keys?

What's the canonical way to manage cryptographic keys associated with particular source code? (e.g. SSH or RSA key pairs strongly associated with a particular program). I am reluctant to check this into version control for obvious reasons, but I don't want them to reside only on few people's local hard drives either. ...

Is there a convenient way to include a mysqldump in my git commits?

Especially if I'm using GitHub? If not, should I (or perhaps someone else) work on such a tool? ...

Source Control system for not-so-smart programmers

Greetings! Problem: A huge code base spanning to several million SLoC, maintained(support/active enhancements etc) by a horde of second/third rate programmers(most of them who do not really care). Decades ago, few smart guys had put in place a wrapper that uses CVS underneath and this system is being used by current...

DVCS with "named commits"

Hi, I'm looking for a DVCS which would allow me to use something like a "named commit" -- similar to what patch queues achieve, but not quite... (I'll compare only to mq and stg, since I don't know of any other similar ones) Patch queues are close, but I'd like those features: Creating new branch in the repository, branches also the p...

Mark Files in SourceSafe as Obsolete

I've recently migrated code off of a limping SourceSafe database to a fresh SourceSafe database. We're maintaining the old database to keep our version history, but I'd like to mark those files as obsolete, so other programmers don't get confused as to which version to use. Does SourceSafe support any feature that lets me flag files as ...

Compiling workflow with version control

Up till now I've used version control for simple web-based projects that don't really have a compile stage. I've now forked a relatively large project that follows the standard "./configure; make; make install" pattern. I'm unsure about the proper workflow for this type of project. What do I do with all the created files from the comp...

Using Mercurial to start a new project similar to an existing one

I have a project on a Mercurial (HG) repository. I am about to start a new project that I would like to start by using the exact same code as the mentioned project. The two projects are completely unrelated. Even though they do similar stuff, each one is for a different client, carry different names, different branding, different art. M...

Continuous integration with distributed source code control

I think I misunderstand something but can’t find what exactly. I googled, but didn't get the idea. There are two popular techniques – continuous integration and distributed source code control. People somehow combine them, but I don’t understand how. AFAIK, continuous integration means commit to the central repository (push) as soon as ...

How to commit this file to svn?

I'm on a Mac and would like to commit a file to svn but get an error that the parent folder is lock. Description : Directory '/Developer/Projects/myappproject/trunk/targetfolder/myapp.app/.svn' containing working copy admin area is missing Status : 155005 File : subversion/libsvn_wc/lock.c, 947 I run a cleanup from trunk: svn c...

ClearCase: How to find files which was not labelled as "Label_Name" on CURRENT Version filtered by config spec

For example, the current config spec is "element * /main/LAETST". there is a file -"A.txt", current version is 3 and a label named "LB" was applied on its version 2 before. I wanna a cmd to query all files which do not apply label "LB" on its current version. Obviously, file "A.txt" should meet the query. How to write the clearcase cm...

Git auto diff in some external text file

Hi all! Sorry for my English ;) I want to make something like auto-diff. For example, Im writing an article and want to paste there all my changes in project code. I hate writing code, then copy-pasting it to text editor, writing comments, then writing code again. Can somebody advice me any way to do smth like this: I edit my some u...