version-control

Source Control – Is a separate branch required for every product?

Let’s say you have four products each with their own release schedule. Each product has 50% shared code (common functionality across all products) and 50% product specific code. Do you need a separate source control branch for each product? Should common functionalities always be developed in one of the four product branches and merged ...

Make SVN use my proxy server

I'm trying to grab the sourcecode for Bro. If I put "http://svn.icir.org/bro/trunk/bro/" into my browser I can see the repository just fine. However, if I try the command "svn co http://svn.icir.org/bro/trunk/bro" I get an error: svn: PROPFIND request failed on '/bro/trunk/bro' svn: PROPFIND of '/bro/trunk/bro': could not connect to s...

It is possible to completely remove a file from my SVN repository?

I am using tortoise SVN for a project that I'm working alone and I have committed (by mistake) a huge file to my repository (a VC++ Intellisense Database). Now I want to remove this file from my repository to facilitate its backup. Removing the file from my project and doing a commit (obviously) do not solve my problem as the previous v...

How to debug old versions of software?

Note: Currently using Perforce as a CM tool. I currently do several debug releases of software [only debug files (.pdb) and binaries (.dll and .exe)]. At every release, I check the all the files used to generate the binaries into our CM tool (baseline). Then I checkout the files and continue making changes. Currently, if there was an...

Cheaper Alternative to Visual Studio Team Foundation?

Is there a fairly inexpensive source control product on the market that integrates into Visual Studio 2008+ and that has the power and capabilities of Visual Studio 2008 Team Foundation? I have used Dynamsoft, SourceGear, Subversion and Platic SCM and reckon that neither of these products can come close to Team Foundation. I ideally w...

git-svn: how to copy git commits from one SVN branch to another?

I've got a git-svn checkout of my entire repo (initialized in the standard git svn init -t tags -b branches -T trunk $repo_url fashion, then git svn fetched). I manually svn copy $repo_url/branches/branch1 $repo_url/branches/branch2. I then ran git svn fetch, git checkout -b local-branch2 branch2, made a few commits to branch2, dcommited...

What are some Simple/Good ways to eventually merge two directories of source?

I have a source directory that includes a mix of different languages and files. Probably 100+ total files. I want to 'fork' that code and create a completely different version of the source. At this point, I will have version-1 of the code and version-2 of the code. I will not make that much development on version-1. I want to chang...

GIT diff GUI.

Hi there, I have a rather large diff of 2 GIT branches and would like to open them in some sort of nice UI side by side. Something that shows me the diff's easily, and hopefully that I can merge differences one by one. git diff is rather hard to work with. ...

Migrating odd subversion layout to git with history

I have a subversion repo with an odd layout: trunk Project1 Project2 tags Project1-0.2.4 Project2-1.9.0 branches Project1-crazyidea I know, I know, this was stupid. I should have had a trunk, tags, and branches directory underneath each Project. However, is there anyway to convert this to git (for a particular project) with...

Git: trouble with setting up daemon, trouble with git clone

Hello, Setting up new git installations. On one Windows laptop, I'm running (under cygwin): git daemon --base-path=/cygdrive/c/work/proj/ My project's root is c:\work\proj\proj1. There is a c:\work\proj\proj1\.git directory. git-daemon-export-ok exists in c:\work\proj\proj1. (git-daemon-export-ok can be an empty file, yes?) On ...

Revert a whole directory in tortoise svn?

For one reason or another I had to empty folder in my subversion repository and replace its contents! I done this using tortoise svn. Can I get the files I removed from the repository back? I have tried doing it throught the log but it appears to only let you revert back files, I need the whole contents of a directory! Thanks UPDATE:...

Using Source Control

I am a very new programmer, I have made a couple basic applications, however I was told that it would be good to get used to using "source control" at the near the beginning of learning so I get accustomed to it. I have gathered that source control is what is used to manage programs with multiple programmers and that it is somehow connec...

Git: cannot merge from master branch "object - It is a submodule"

I'm having difficulty merging from my master branch to a separate branch I've been developing on in quite sometime. Doing a straight forward merge I get the following: shell$ git merge master fatal: cannot read object asd211f3a58febecd4e447szxs733079211c71b7sa '/my/sub/dir/foo~master': It is a submodule! I never setup the library 'f...

SVN - Delete existing repository

I made the mistake of modifying my original source after importing it into subversion. I now need to re-import but get a "File already exists:". How can I most cleanly remove my existing repository and add it back? ...

Should universities be teaching SCM/methodology skills?

Most CS programs these days do not teach skills such as: source control configuration management integration (and continuous integration) code readability (AKA how to comment correctly) programming methodologies bug tracking These topics are considered easy enough to be taught on-the-job (OTJ), even though mastering them can be very ...

need to implement versioning in Online backup tool.

Hi Guys, I am working on the developement of a application that will perform online backup of the files and folder in the PC, automatically or manually. Currently, I was keeping only the latest version of the file at the server.Now, I have to implement the versioning so that only the changes can be transfered to the online server and us...

Improper Use of Version Control

I have started working recently in driver verification for a hardware company. The work is writing short software tests that verify known issues, bugs and possible faults anyone can think of. Now, in the course of my basic training for the role here I have come across an ugly practice of version control usage. The company uses SVN for h...

Best way to check version of dependent project.

I have two project A(application) and B(library) both in C# 3.5. A refers B. Now what I want is A should not build or crash at runtime unless it uses a certain version of B. Which is the best way to achieve this? Should I go for strong naming? Project A will have continues changes made to it. However project B will be more or less stat...

How can I generate the difference between 2 commits which ignore spaces

In my git log, I have 2 commits. How can I generate the difference - ignoring spaces - between them? $ git log commit e5640171f391fdf479fa14fab0da6628efed1fa6 Author: test <[email protected]> Date: Mon Jul 13 11:41:02 2009 -0700 Fix Bug 1. commit 0984e27b75f480da8b8c4ce2399bf877c557a78d Author: test <[email protected]> Date:...

Do I need the .dat file when I place a visual studio database project under version-control

I have a visual studio 2008 database project that is under version control (git). I am getting conflicts in the project_name.dat when I try to merge my branches. So my questions ares: What is the project_name.dat file? Do I need it? That is can I leave it out of my version control ...