version-control

Version control and release management

Are there any so-called "version control systems" that also support actual release management / deployment ? The mainframe shop I used to work for, had an automated release management tool that did not only control concurrent modifications to sources, but that also took care of running compilers, precompilers, database bind utilities et...

Database source control with Oracle

I have been looking during hours for a way to check in a database into source control. My first idea was a program for calculating database diffs and ask all the developers to imlement their changes as new diff scripts. Now, I find that if I can dump a database into a file I cound check it in and use it as just antother type of file. T...

How do I avoid Complicated Merges in Subversion?

I'm new to Subversion (SVN) coming from a Visual Source Safe (VSS) background. In VSS the person editing a file checks the file out and it locks the other users from editing it through Visual Studio. I understand that SVN is a concurrent model allowing multiple people to work on the same file and later merge the changes together. My q...

Reducing differences in xibs

I've been noticing superfluous changes in my xib files with Interface Builder 3.2.1. Here are a few of them: - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> - <reference key="NSSuperview"/> - <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <integer value="6"/> - </array...

How does git track source code moved between files?

Apparently, when you move a function from one source code file to another, the git revision log (for the new file) can show you where that code fragment was originally coming from (see for example the Viewing History section in this tutorial). How does this work? ...

What is the best practice for setting the SccAuxPath property in a Visual Basic .NET project for a distributed team?

We've recently moved to Team System and now a remote team needs access to our source. However, they use a different IP address to access the Team System server, and whenever they try to open a project, they are prompted to check out and change the project. Is there a way to work around this? It seems to be the 'SccAuxPath' property wh...

git: merge a portion of one branch's source tree into another, regardless of individual commits

I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A colleague has a branch that's made significant changes to both subprojects. More specifically, he's altered them both to depend on a common bit...

Removing a file from TortoiseHG data source

Hi! I am using TortoiseHG for source code control in Windows, I forgot to edit the ".hgignor" file, and now I have a huge folder ".hg" which I know it's because of DLL and EXE and PDB files which I do not need them. Now changing the ignor file does not remove those files. What should I do for deleting these files completely from my Tor...

Best open source alternative for MS Visual Source Safe?

We are leaving VSS for TFS or any other alternatives. I'm the one who persists to go for an open source alternative like SVN. Now I'm searching for a good open source Version Control regarding following aspects: We are in love with open source movement and cross-platform. Could it be possible to use it with Mono, SharpDevelop and Expre...

How do you commit ONLY files you've "added" to version control in subclipse?

I just spent a fair amount of time selecting the files and directories I wanted under version control. I'm running subclipse under eclipse. I right clicked, Team, Add to Version Control. Now I want ONLY those files committed without right clicking the whole directory which contains a huge number of media files that I don't want handled b...

Has anyone used Rational Team Concert (RTC)?

The company I work for is currently evaluating replacements for SourceSafe, and for various reasons, I think RTC will be chosen. I'm a little scared that we're going to end up with a solution that isn't the best for us in our situation. I've tried researching a little bit about what it is, but all I have been able to find are marketing t...

[git] 'git pull origin mybranch' leaves local mybranch N commits ahead of origin. Why?

I just observed something odd about git pull, which I don't understand. On Friday, I worked on a local branch. let's call it mybranch. Before leaving the office I pushed it to origin (which is my github repo): git push origin mybranch. Yesterday at home, I pulled mybranch to my laptop, did some more coding, and then pushed my changes b...

Illegal Instruction in service using SCM in VC++

Hi guys, I have issue in service created using VC++ code. as my ServiceMain function ends. it returns following error in End of the function(in release it crashes.) Unhandled exception at 0x0012e3b4 in Adiserv.exe: 0xC000001D: Illegal Instruction. i am unable to figure out the issue. can you help me out... Thanks Ashish ...

Learning SVN - Simple beginner questions

Just started with SVN. Here is a very basic set of questions that I have after reading several articles, tutorials and playing around for a couple hours. When I create a repo is it supposed to hold all of my projects or just one? It seems odd that after running import on a few projects that my revision count is going up for each new pr...

Tracking Versions, Builds, Revisions, with TortiseSVN

I am the sole developer on a project and have been using tortoiseSVN for quite a while. Now Id like to start getting version information working correctly in the project I.E. show Major Version, Minor Version, Update, Build/Revision in the log files and in Help > About etc... I cant seem to find the best fit. svn keywords Revision seem...

version control in virtual machine

My employer wants to run our version control system in a virtual machine. Is this a bad idea or does it not matter? I am concerned about disk access integrity and stability. Are these valid concerns? Are there other concerns I should have? Thanks ...

svn video tutorial

Hi there I wish to learn/understand/use a version control. Do you know any good video tutorial? I'm programming in PHP and C/C++(learning stage) but i think this is not important as long you get the concept. How can I get the concept? ...

Netbeans CVS - existing repo - existing working copy

I'm using Netbeans to develop with Drupal. I'm trying to let Netbeans get drupal core and modules from the repository on drupal.org to my local working copy. Problem is: I already have a working copy that is not versioned yet. When I try to checkout a copy from drupal.org, Netbeans asks if I want to create a new project - I don't. Ho...

TeamCity Alternatives

I write a lot of little projects, and I'd like to use something like TeamCity for my build server(s). My problem with just using TeamCity itself is that the Professional version of only seems to allow for, at most, 20 projects. And since these projects are generally not-sellable, the price tag for the Enterprise edition is a bit much. ...

Subversion + Some other VCS (Git, Hg, etc) in the same working copy

Here's the deal: I just started a new job, and source control here is basically useless. All of the devs (about 10 guys) test their code in the same dev site, and there's no way to test a change other than commiting the change to SVN, and then it automatically gets updated in the dev site. (Let's not even start talking about the headache...