version-control

Add existing project to solution under visualvsn

We are changing from SourceSafe 2005 to visual svn. How can an exisiting project be added to a solution Example: I create solution1 with 3 projects and add to /trunk I create solution2 with 1 project and add to /trunk In solution1 I add existing project from solution2, but I cannot add to subversion. I get "out of working copy, use...

Visual Source Safe: get versions where a specific line has changed.

I'm trying to run down when a particular bug was created, but wading through the history is pretty time consuming. Is anyone familiar with a command line method to get a list of revisions where a line or range of lines changed? svn and vault evangelists: I know, right....but you can't always pick the environment.... ...

How do I do an initial push to a remote repository with Git?

I've read through countless tutorials and I keep coming up short. Here's what I've got: -- I'm running RubyMine on my Windows desktop -- I've installed Git on my WebFaction hosting account per their instructions -- Git appears to be working fine on both machines Here's what I'm doing: 1. On server:          a. mkdir project          b...

svn says conflicted but it's really merged (TortoiseSVN)

Lately I've been seeing behavior where after an update svn shows certain files as "conflicted" but when I try to edit the conflicts, there are none (The "next conflict" and "previous conflict" buttons are disabled and if I scroll through the file, none of the lines are marked red). This seems to have started after I started working from...

Version control for large php/mysql web application

Hello everybody! I am working on a large php/mysql application, and I am getting to the point that i have to use some kind of version control. I have read a few articles on GIT, but i can't seen to figure out what the best way is to go about this. I have a dedicated server that runs CENTOS with PLESK. And i mainly develop on my local ma...

Can Rational Team Concert and IntelliJ coexist?

I am a long time intellij user. The company where I work is likely to introduce Rational Team Concert to our department shortly. I went to the RTC demo and it looks like a reasonable product, built around Eclipse, but I would rather not give up using IntelliJ. Does anyone have experience of using non-eclipse IDEs with RTC? ...

SPFileVersionCollection - why versions are sorted in mixed order?

SPFileVersionCollection and SPListItemVersionCollection versioning seems inconsistent to me. Inconsistency wouldn't be a problem to me, but sort order is. SPListItemVersionCollection I can understand versioning of ListItems as they are stored in descending order: SPContext.Current.ListItem.Versions.Count -> 5 SPContext.Current.ListIte...

Safely delete a TFS branch project

I'm currently reorganising our TFS source control for a very large set of solutions, and I've done this successfully so far. I have a problem at the moment where I need to delete a legacy "Release Branch" TFS project that was branched for the old structure, and is no-longer required since I now host a release branch within the new struc...

How to detect modified files that were NOT checked in?

I am seeing noob developers forget to check in modified files into a SVN repository. They check in only some files and leave out others!! Clearcase made it easy to see all the modified repository files. What is the equivalent command(s) in SVN which will let a noob developer see all the modified files (so all files can be checked in) ? ...

How do I determine which changes in one branch are missing from another?

I'm using git. I have a branch, apifixes, that was branched from master some time ago. Most, but not all, of the changes from the apifixes branch have been merged back into master. At least, I believe this is the case, because when I try to do git branch -d apifixes I get the following error: error: The branch 'apifixes' is not an...

Should developers be forced to check-in before leaving work each day, even if the code does not compile?

During a previous consulting position, the developers where told to check-in code on a nightly basis, regardless if it complied or was complete. Managers were afraid of losing any code and said now we only lose one day at most. The place I'm currently it is investigating whether to implement this. Anyone have any pros/cons on this? Sho...

git + partly shared files between branches/repositories. Is it possible?

One team in company I work for has the following problem. They develop an application, which will have different builds (e.g. different design depending on customer). so they have some code shared between builds, and some specific to build. E.g. first build has (example is meaningless about files, it is just to understand the problem; I ...

linking git and github repositories

I'm looking for a clean way to import one git repository from another, where both repositories exist on github. The two repositories are private, in case it matters. The idea is that one repository represents one project and the other simply needs to use that project. It doesn't make sense to check in all the code from one repository i...

Revision Control For Windows CE

I have a HP Jornada 720 with Windows CE 3, called Handheld PC 2000. And as a good developer, I want to turn it into a fully-featured Scheme development environment. I already have Pocket Scheme on it, but now I need a revision control for my pocket development environment. Then I want to know: Where I can get it? ...

Merging feature branches to release branch instead of trunk

I have a question about two source control scenarios, both with feature branches and release branches: In scenario 1 feature branches are merged to the trunk. In scenario 2 feature branches are merged to the latest release branch. What are the consequences of scenario 2 compared to scenario 1? What are the possible advantages and di...

Lost Last Git Commit

I lost my last commit because I accidentally ran "git reset --hard HEAD^". Note: I didn't want to put the "^" at the end. Is there any way to get it back? It was 2 days of work :( ...

What Eclipse metadata files should be in the repository?

I'm working on a new project with a full ANT build. I use eclipse to write my code, and I would like others to be able to check out the project to have a full working eclipse workspace. I do not want to have specific user settings committed though. What files and directories should I have in source control? (I'd rather not just go grab...

Basic question: Is a subversion server necessary in this scenario?

Right now: I have a few personal software projects I develop (just me, and on just one PC) extensively use TortoiseSVN for version-control run CollabNet Subversion Server on the same PC Is there really any advantage in having a server instead of just pointing to the repository directory? For example: instead of commiting to svn://lo...

Is there a good guide to starting out with Mercurial?

I'm looking for a good tutorial for Mercurial. ...

Single or Multiple Git repositories for libraries shared between teams

I am looking at how/if I should make the switch from svn to git. I currently have a multi-layered set of projects in svn which are layered such that D uses C which uses B which uses A. Actual deployed projects like X,Y,Z use any of the common libraries A-D. The aim is for future projects and other teams to share the base libraries (A-...