version-control

I need to start using Versioning and Source Control...

I'm a PHP/MySQL developer who hasn't used any form of versioning aside from copy/paste into a backup folder. I develop Windows, as well. Where should I go, and what should I do to start using Versioning and Control software? I'm curious, do these methods also apply to the databases you're using and their schema's? ...

Visual Studio: Show file differences between local and source control?

Is there a Visual Studio addon, or a method present already, that allows me to recursivly compare a project/solution/folder with what's in source control? Note: Source control product agnostic (a.k.a VSS) Update The reason i assume is there is a source control agnostic solution is that Visual Studio supports Microsoft's MSSCCI API. ...

What files to keep under version control on iPhone projects?

I found this previous question about Cocoa projects, but I wanted to know if it's the same for iPhone projects. ...

.gitignore File not ignoring

I have an already initialized git repo that I added a .gitignore file to, how can I refresh the file index so the files I want ignored get ignored? ...

Serializing/deserializing a sqlite database with the Visual Studio Entity Framework & C#

I'm using the SQLite.net provider and VS Entity Designer to design and code against a sqlite database. At present, a model sqlite database is checked in to the source tree. However, this is binary which is inconvenient for use with a revision control system. I'd like to check in a serialized version using sqlite's .dump, but am not sur...

SSAS Versioning Without Source Control

What is the best way to manage and combine different versions of SSAS solutions, without using version control? Currently, we have a network drive where the "master" copy is stored. So individual develoeprs work with a local copy, but we recently ran into a problem with adding changes to the "master" copy. Any suggestions? Microsoft ap...

Emulating symlink-like behaviour in a source control repository

Suppose I have the following (desired) folder structure: *CommonProject *Project#1 ----> CommonProject(link) *Project#2 ----> CommonProject(link) Where the CommonProject is the location of the source belonging to that project, and CommonProject(link) is merely a soft link to the main location. If we imagine this as a tree-view in a vi...

best practice in storing non-source files under version control

I have a project under version control, but the project has some images, videos and zip files that change every so often. I don't want to store these files under version control because they take up a lot of space and make updates and commits very slow. What's a good way of dealing with this issue and still commit non-source files that ...

How to intelligently change branches in subversion?

I'm out of the office working on a large codebase and the time has come to change branches. I cannot checkout the whole project from scratch because my connection is flaky, the vpn client is even flakier, and together they cannot handle the larger commits. Since the branches are very similar, I should be able to ask subversion to tra...

Good link or book for basics and theory of version control

Good link or book for basics and theory of version control Would like to really understand all of the fundamentals and theory of version control. Probably implementation agnostic but if book or resource uses something to practice with that is fine. Was looking at the pragmatic series. Is there something better or open source? ...

How to efficiently handle the changes between production and development when updating from the repository

I have inherited a project with a local development environment that has code specific to that machine, and which is different for the production server. Even though the majority of it is contained in constants and the rest is in the tests, every time I commit from development and update in production I'm going to have to make the same ...

preserving history when using mercurial ontop of clearcase

I work in a ClearCase shop and CC does a good job of integrating the team's work though our code review process prevents me from using it to track my daily changes. Creating an hg repository on top of my CC view works really well. I can track my changes and easily make backups on the file server, produce diffs for people etc. This is a...

How do you continue working off an old revision in subversion when you forgot to make a new branch

duplicate: How do I roll back all or part of a commit to svn? I've set up an account at http://www.projectlocker.com/ for one of my projects. I'm the only person working on it but I figured having version tracking would still be useful, and it's a good learning experience. I've setup the standard folder structural with /trunk/, /branch...

How to revert all local changes in a GIT managed project to previous state ?

This is probably the simplest newbie question. I have a project in which I've run git init. After several commits, I do a git status which tells me everything is up to date and there are no local changes. Next, I make several consecutive changes and realize I want to throw everything away and get back to my original state. Will this c...

How to work with liquibase, a concrete example

Following the quickstart on liquibase i've created a changeset (very dumb :) ) Code: <?xml version="1.0" encoding="UTF-8"?> <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.6 ...

Version Control: Taking on a project without any

Hello all, I've recently taken on a project with no version control. I don't have any experience with version control myself. I feel it is the only way to go with this project (and probably any future projects now I think of it - I always trust myself too much..) My question is - where do I begin with implementing version control on a ...

.NET / TFS - Source Control - Output of One Build Included In Another

What is the proper way to include an output of one build as a binary in another build? Lets say I have a solution called CompanyName.Domain (my Domain Layer). I have it set up as a build and it builds nightly. Now I want to add a solution called SomeProject.Web. And I want to include the binary out of CompanyName.Domin into a Binaries ...

source file control cvs to svn conversion?

Hey guys. I currently use cvs to control all my source files but want to move away from cvs to svn. Could anyone give me some pointers? I have loads of projects but they are all similar therefore would like to just have the structure: Trunk. /prj1,2,3, etc Branch. As above Tag. As above I am going to be using the cvs2s...

How do I "switch" with Mercurial

How do I do what svn switch does, in Mercurial? That is change my working directory to switch to another branch in the repository? ...

Are svn merges idempotent?

Seems to me like they should be. I'm assuming you've resolved any conflicts that arose during the first merge operation. ...