version-control

Creating a SSH key with ssh-keygen does not create the .ssh folder

Hi, I am trying to create my public/private rsa key pair with msysgit I run this command: ssh-keygen -C "[email protected]" -t rsa Everything looks fine, I have the message Enter file in which to save the key (/c/Users/user/.ssh/id_rsa) Then I have the confirmation: Your public key has been saved in project.pub But I can't acce...

Creating a submodule in a git project

Hi, I have a Django project and it's currently hosted in GitHub and it's private. I'm looking to move many useful parts of it into an open-source project. I think I need to use a 'submodule' thing, but unfortunately I have no idea how to operate these. Please can someone help me :) Joe ...

Online Software Tracking Software

I am looking for a good development tool that will help me track revisions of software I am creating, and that is web based. Just looking for suggestions on what others use. And not one that is hosted through another solution but that I can host myself. ...

Require Story/Issue Reference with TFS Commit Comment?

I recently joined a project team that is using TFS (I have happily avoided TFS until now). I am trying to determine if there is a way to require a story/defect reference to be associated with every commit comment? With Tortoise/SVN it was easy to add a requirement for a reference number to be required with each commit. Personally, I li...

How can I "split the branch further" in mercurial?

Admittedly a misleading title, but I didn't know how to put it better. So I made the mistake of pushing all my project specific changes BEFORE I opened a branch. That way, there are some changeset sitting in the default branch that does not belong there. They should be in my newly opened branch. Do I have to backout all the changes...

How can I share in Eclipse a project programmatically?

Dear All, I work on an EMF project. The resulting model instantiations (XML files) are supposed to go into a source repository (SCM). We have a specific repository for the users and I would like to hide the SCM setting-up from the user, retrieve the projects automatically and add new projects automatically. I would like to reuse parts ...

Necessity of having license information present in all code revisions

I'm considering posting some code on github. Older revisions of the code don't have a COPYING file or other licensing information in them. What's the effect of posting this publicly? Would people be able to copy and use that code freely without adhering to any license constraints? Although there doesn't appear to be a "default licens...

utility to create/update license information

Is there a utility to manage license information? Mostly this would just be a minor convenience, but I'd like to be able to do something like $ licentious -L GPL -s git -m "A utility for managing license information" to create a file named (by default) COPYING in the current directory, using my name and email address as configured in ...

VSS2005: how to use labels to allow quick compiling of earlier versions of code?

Using Visual SourceSafe 2005, what do I need to do to tell VSS 2005 that the current version of code should be labelled (or whatever) so that after further revisions I can come back later and get the version of code that was labelled? ...

How to find all checkedout files with ClearCase cleartool?

I'm trying to setup our ClearCase with Hudson for a continuous integration (and deployment later). I finally got a UCM view for the build, but unfortunatly our build process checks out files to store the build number. Now the build broke and the file is still checked out, preventing the next build. I already now about cleartool find . ...

Is there a way to limit the amount of memory that "git gc" uses?

I'm hosting a git repo on a shared host. My repo necessarily has a couple of very large files in it, and every time I try to run "git gc" on the repo now, my process gets killed by the shared hosting provider for using too much memory. Is there a way to limit the amount of memory that git gc can consume? My hope would be that it can t...

version control for one-man project using eclipse?

I'm currently working on several projects on my own (at least the developing part is done only by me :). Using Eclipse with different Java, R, SQL and other source files I'm wondering what version control system would be best for me. At the time the history of Eclipse IDE seems to be enough, but I'm not sure if this will be true in a mo...

Is there any distributed revision control system that supports partial checkout/clone?

As far as I know all distributed revision control systems require you to clone the whole repository. For this reason is it not wise to put huge amounts of content into one single repository (thanks for this answer). I know that this a not a bug but a feature, but I wonder whether this is a requirement for all distributed revision control...

I'm trying to merge two different branches, but git tells me that everything is up-to-date

I'm a git noob, and I know I'm missing something fundamental here. I've got three branches: master, feature1 and feature2. No two branch is identical, yet any attempt to merge from one branch to the other results in an "up-to-date" message. As you can imagine, I've done my work on feature1 and feature2, and now I just want to merge that ...

Versioning and Solution Structure in Visual Studio

I have a system that has three applications (one windows application and two web applications). These applications all share two assemblies in common. Therefore, I have 5 projects in total. In the past, I have had a separate solution for each project. This allowed me to version each assembly individually in source control. However, ...

Visual Studio 6 SVN plugin

We currently use AnkhSvn with Visual Studio 2008 but have one solution that is still coded in Visual Studio 6. Are there any SVN plugins that operate with such an old IDE? Looking to move away from SourceSafe (shudder) and amalgamate our source control but would prefer to have a tool within the IDE rather than using tortoise SVN. ...

How to force svn.exe to ignore files from specific changeset when committing?

I have a custom tool that uses svn.exe for committing files, and my project has several files to ignore on every commit (configuration files). This scenario is working well with TortoiseSVN, which moves them into a changeset with "ignore-on-commit" name. svn.exe has parameters to commit changes only from the particular changeset, but it ...

Is git's merge conflict resolution more efficient than other SCMs and merge tools?

Is git's merge conflict resolution inherently more efficient than other SCMs (CVS,Subversion,etc.), and also standalone merge tools? If so, why? Clarification: here I'm more interested in the algorithm itself - is it any different from a plain diff3 method? Some tools claim to be smarter in that(e.g. Guiffy), is it worth plugging one in...

Mercurial - Is it possible to merge changes from the trunk to a branch, within the same repo?

Mercurial - Is it possible to merge changes from the trunk to a branch, within the same repository? If yes, is it possible with TortoiseHg? ...

Automated version number in a VC++/CLI app using innosetup to distribute.

I maintain a small app which is built in VC++ 2008 (a .net app) which I distribute using innosetup. Currently I manually update the version number in the header of the main app: static String^ m_version = "1.1"; static String^ m_build = "1"; The software puts this together internally to report v1.1.1 in this case. To do a release I t...