version-control

How do you reuse html/js/server side code between asp.net projects?

We have a blog system that we sold to a number of different customers (included in many different projects). This system includes a number of different files – a few aspx pages, one or two ascx controls, one css file, one javascript file and some codebehind/vb.net utility files. In general 90+% of this module is the same between custom...

Automatic change of web.config under source control during CI build

I am working with couple of friends on an ASP.NET MVC website. The project is maintained in SVN and I have CC.Net set up to checkout latest version and do automated build and deploy to a pre-production server. The default build configuration is set to Debug, but the automated build is set to build Retail. Everything works just fine, exce...

What third-party/hosted source code management service do you use?

There are many services offering hosted code repositories and version control, some are completely free like Sourceforge, Google Code, Codeplex, others offer paid services for private code like Beanstalk, GitHub or Springloops. But which service do you use and why? If there is a list of existing services, I'd like to know about it as we...

How to use source control tools to have students turn in assignments

This semester I'm teaching a class at a local university. Thus far, I've had the students turn in their programming assignments by emailing them to me. But there is a lot of hassle when pulling 20 solutions out of emails. Has anyone ever used a source control tool to have students turn projects in? What did you use and how was it set u...

TFS: How can you Undo Checkout of Unmodified files in a batch file

We use a batch file to generate code, and it automatically checks out the generated files from Team Foundation Server (TFS) so that it can regenerate them. The majority of these files are not modified, but the generator does not know this ahead of time. The "tfs undo" command undoes the checkout, but prompts if some have been modified (...

Managing DB reference data and it's related code

Reference Data, or lookup tables are things like CustomerType, ProductType and so on. They change infrequently, occasionally a new type is added or an old one retired. In code they're often reproduced as enums/constants, and also used to populate combo boxes. Adding a new Type shouldn't break existing applications, and more often than no...

Where to place Git repository

Hi, I just started using Git and I want to know if this is the right way of using it. I started a Rails app with: rails newapp Then I did: cd newapp git init git add . git commit -a So is it "right" to init my git inside my working directory? ...

TFS Strategy for moving large number of projects from Source Safe

The company I work for has over 1000 apps which we maintain. Many of these are in old technologies like VB6, or poor technologies (Access). We are looking to move away from Source Safe. We have TFS running, and we are moving our dot.net projects to TFS. The other projects don't integrate with TFS, and do not need a portal or any of the ...

What's so great about git?

For someone coming from a more conventional VCS background (CVS/SVN), what are the most compelling reasons to learn and migrate to git? Please comment upon a team's required technical ability in order to make git work. I've seen smart people climb the learning curve and still lose some hair over it. Can anyone climb this curve, or is ...

Is there a fundamental difference between backups and version control?

How does version control differ from plain backups? Let's forget about the feature decoration, and concentrate on the soul of version control. Is there a clear line that backups must cross before they can be called a VCS? Or are they, at heart, the same thing with different target markets? If there is a fundamental difference, what is ...

Favorite server OS and source control system for small project.

I am starting a small project with one other developer and need to setup a dedicated system to house our version control and any other short-term needs the project may have. Requirements for the server are: Free/open source OS. Must provide source control. Must run all the time. That's it. So I know there are about a thousand Linux-b...

Is it possible to alias a branch in Git?

I am looking into using git on a massive scale. I was hoping to increase adoption and make things easier by calling the master branch trunk. This can and will give SVN users some feelings of comfort. I know I can create a branch called trunk but that seems to deviate from the git norms and might cause some users to get confused. I kn...

Can't git fetch through SSH

I've setup a git repository one a remote server. Now I'm trying to checkout from it with: git fetch ssh://[email protected]/~username/workfolder/ but I get an error: fatal: Not a git repository What am I doing wrong? Could it be the server does not support Git+SSH? ...

Setting Git for a team of 3 people?

The post aims to summarize all pieces of information to set up a closed repository for 3 people in a competition. Please, feel free to add a problem to the list which I have not noted. Please, add each answer to each question as a separate answer. Situation A: Drafts and files can exchange between 3 people. The writer can only push fil...

Web app deployment Best Practices : how to manage local & live files?

Hi, I am writing php web applications, and simply deploy them via FTP. To make it work, I often have some tweaking/debugging to do given that I have little control over the (free) web server hosting me, so what's working in my local environment might not work live. For example I keep a separate php file containing class_db_myapp.php wh...

Managing multiple code branches and deliveries

I work for a small one-product one-customer company that is transitioning to a one-product, multiple-customer company. Even though we've had just one customer, we've had different projects with different delivery dates, but for each project we've been able to deliver the latest monthly release which we've kept in a separate code branch i...

Tortoise SVN Command Problem

I am trying to use the Tortoise SVN command line utility TortoiseProc.exe. The docs suggest that a command line like this: "TortoiseProc.exe" /command:diff afile.cpp` should do a diff and display the results in the configured diff viewer (in my case Tortoise's own one), but instead nothing happens - the viewer is not launched & no err...

History visualization tools for version control systems?

Specifically, I'm looking for something that, given a single file, and an SVN history, will display insertions and deletions as a pretty animation. That said: I figure that a list of version control visualizers might be a useful resource. ...

License restrictions on including a DLL in another repo?

Answered: They don't allow any kind of redistribution with 2.6, supposedly, unless you have licenses for it. But they don't sell licenses for it. But they give it away free. But, who knows, i think they just want us to buy an overpriced thing we don't need to write a free utility. I guess I'll look at NVelocity or TaHoGen... I ...

source check-in analysis software installed ... now what?

I just found out that my workplace has installed software that analyzes source check-ins for such things as who checks in the most lines, when they mostly do their check-ins, which files have the most changes, etc. I'm a bit concerned that this has something to do with the economic situation, and they are looking for a way to measure "d...