Given that two branches have diverged and a specific commit from one branch (and not everything) needs to be introduced to the other, git cherry pick achieves exactly that. After some time there is the need to completely merge the two branches. How will git know that it has already the commit that was cherry picked in the past so that ...
Hi, The UNIX department of my company currently uses CVS as source-version control system. They use it in a very strange way: different repositories for development/testing/production code (for the same project), no one tags anything, weird directory architecture, and so on. The system has been set for ages but now, I have an opportuni...
I have the following directory structure in the CMS application we have written: /application /modules /cms /filemanager /block /pages /sitemap /youtube /rss /skin /backend /default /css /js /images /frontend /default /css /js /images...
For example in git you could do git commit --allow-empty -m"I like what this guy did" I was considering using commits as a commenting system, and I just wanted to see how that would go over. ...
We're committed to git for code management. We're trying to find a tool that will help us systematize code reviews. We're considering Gerrit and Code Collaborator but would welcome other suggestions. We're having a problem answering the question, "How do we know every commit was reviewed?" (Or "What commits have yet to be reviewed?") ...
Today I installed Visual Studio 2010 Ultimate - RTM. One item that I noticed that is different is that files listed in the Solution Explorer window not longer display the source control icons beside each file (the lock, unlocked, plus sign for new files, etc.). Is there a setting that I am overlooking to display these icons? I have se...
Hello, I am new to repositories and am currently looking around to find the best possible option. I need something that can handle multiple versions of our website, and allow multiple collaborators to all push to the repo together. Our current project is built in PHP, and we have a MySQL database. I am short on funding and need the ...
I was looking for information on how other people with larger teams manage SourceSafe currently. I was looking for recommendations and advice for a new project I was setting up that will allow for a few key things Scalability Manage multiple overlapping releases Geared more around .NET however allows for legacy applications (VB, ASP an...
I'm working on a project which will end up have a lot of application information stored in the form of records in a database. In this case, it's the configuration of data views: which grid columns to show/hide default filters to apply to each grid view column titles sorting subtotaling ... This information is a big part of the value...
I did a ton of changes to our code and before I commit, I would like a friend to review. Is there a way with SVN to take a copy of my working copy (to bundle everything in a package) and apply the changes I have made so far to another machines without having to commit? In the past, with another source control system, I was able to do th...
Hi all, I have next situation. I need to choise source control system for my project. This scs must provide the API to my .net application to get information about check-in-s for specified user and date period and about changes which was done in this check-in-s (the number of added and updated lines). What source control system provide...
It doesn't look like git-p4 is part of the MSys-Git project for Windows. Does anybody know how to get it running through Windows? ...
Could somebody please explain to me why people warn about commit conflicts occuring from a rebase operation? I tried reading about this by searching google but had some trouble understanding. If it matters, I am using ClearCase revision control. ...
Secondary questions are How do we best utilize SCM in the build process? How are code files labed and branched? Should we the .csproj and .sln files for build? How flexible are these when deploying to several environments? I know these are msbuild files. But as we add new files, this can become a bottlenect of updating and maintaining...
I am trying to contribute to a project that uses Subversion. I used Mercurial and its hgsubversion extension to clone the repo. My work takes place on a feature branch. How do I keep the feature branch up to date with stuff that happens on the default branch (hg speak) aka the trunk (svn speak)? So I used hg up feature to update to t...
Is there a list of all the source control systems that have visual studio plugins? If not, we can make one here... ...
I have a project I'm looking to manually manage via perforce version control as I only have the Express edition. What I'm looking for is which files should be excluded in the version control as locking many of the files can result in a problem for visual studio compiling and debugging. What I have, so far, included. .cs files (except p...
I'd like to write a series programming lessons that guide programmers to build a certain kind of program. After each lesson, I'd like to provide sample code that implements what that lesson covered, and the next lesson would use that code as a starting point. (Edit: The repository is for my use only. Anyone working through the lessons...
Hello, I am working on an ASP.NET web application, we are a small team (4 students) and we do not have access to a dedicated server to host the database instance. So for this web application we decided just to put the database file in the App_Data folder. The problem is that our project is source controled on TFS, so every time you ope...
As you all know Visual Studio Express edition do not support Source Control Integration and Add in As it is obvious there is a feature which allows VS tointegrate with any kind of source control. So I'm using VS express for myself (in home, and for my presonal Project and want to use a source control for my projects) So what should I Do...