Stack Overflow
Stack Overflow

Questions tagged [version-control]

Version control is the management of changes to documents, programs, and other information stored as computer files. Use this tag to mark general questions about usage and applicability of version control, VCS comparison. For most commands and techniques specific to each particular VCS there are specific tags, which should be preferred.

Version control, also known as revision control, source control or software configuration management (SCM), is the management of changes to documents, programs, and other information stored as computer files. It is most commonly used in software development, where a team of people may change the same files.

For questions specific to a certain version control software use the appropriate tag. Here is an (incomplete) list of commonly used tags:

17112 questions
13
votes
4 answers

How to best configure a central repository/multiple central repositories for Mercurial?

I am new to Mercurial and trying to figure out if it could replace SVN. Everyone I work with has used SVN, CVS and VSS (shiver), so this could be quite a large change. I have been very interested after reading about its merge and branch…
Mario
  • 3,405
  • 6
  • 38
  • 48
13
votes
1 answer

PHP - Database schema: version control, branching, migrations

I'm trying to come up with (or find) a reusable system for database schema versioning in php projects. There are a number of Rails-style migration projects available for php. http://code.google.com/p/mysql-php-migrations/ is a good example. It uses…
Billiam
  • 2,349
  • 2
  • 19
  • 19
13
votes
7 answers

How to manage and capture database changes across several developers?

We have three developers and one tester all working against the same database. We change the schema of the database quite often, and every time we do it tends to have a ripple effect of headaches for everyone else. Are there good practices in place…
Matt Greer
  • 60,826
  • 17
  • 123
  • 123
13
votes
2 answers

What Python bindings are there for CVS or SVN?

I once did a cursory search and found no good CVS bindings for Python. I wanted to be able to write helper scripts to do some fine-grained manipulation of the repository and projects in it. I had to resort to using popen and checking stdout and…
Mike
  • 3,663
  • 3
  • 20
  • 12
13
votes
3 answers

How do you do merges using Git, Eclipse and Egit

I, like many others, love Eclipse as my ide of choice, and because of the way I work (moving about, different places, different projects) want to use Git for CVS. There is a plugin for Git in Eclipse, Egit, which is now an official Eclipse project,…
PaulHurleyuk
  • 8,009
  • 15
  • 54
  • 78
13
votes
4 answers

"push creates new remote head" issue

I read all SO questions about this issue, and I still can't resolve it. I am using TortoiseHg. I worked on a side-branch, and now I want to merge it back to the main branch. I pulled all changes made in both branches, updated to the main branch, and…
Itamar Katz
  • 9,544
  • 5
  • 42
  • 74
13
votes
1 answer

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…
Brian Henk
  • 623
  • 1
  • 6
  • 14
13
votes
7 answers

What are Git and Subversion all about?

I see a lot of sites referring to git, github, svn, subversion etc, but I never really knew what all of those things are. I also hear a lot of terms like 'svn repo', 'commit', and 'push' - I tried googling but it seems that I have so little…
Yuval Karmi
  • 26,277
  • 39
  • 124
  • 175
13
votes
4 answers

How to rebase one repo to another

Let's say I have two different repositories like so: Project 1: Init---A---B---C---HEAD1 Project 2: Init---D---E---F---G---HEAD2 Is there a way to rebase Project 1 (Init to HEAD) to the Init commit of Project 2 so it looks like this: Project 1 &…
dirtytofu
  • 245
  • 4
  • 9
13
votes
9 answers

Tortoise SVN hidden _svn folders

They are specially annoying when I need to upload to the server a web solution. Is there a way of configuring SVN to create the _svn folders outside my working directory? If not, what is the best way to deal with them when you need to copy only the…
Santiago Corredoira
  • 47,267
  • 10
  • 52
  • 56
13
votes
1 answer

How can I track system-specific config files in a repo/project?

I have a ruby project, and the database host and port might be different on dev and production. I need a way to get different values for those into my scripts for the two environments. The project should be complete - so there should be some way to…
Sean Clark Hess
  • 15,859
  • 12
  • 52
  • 100
13
votes
1 answer

How to locally ignore .git and .gitignore in a svn repo?

I have a SVN working copy (managed by TortoiseSVN). In that working copy I use git for local version control and branching. Of course, I want to hide the .git directory and .gitignore file for svn. However, ignoring them means adding a property to…
Joma
  • 2,334
  • 2
  • 20
  • 25
13
votes
5 answers

git svn rebase: Incomplete data: Delta source ended unexpectedly

I have been maintaining the git mirror of the watir project. Some time a couple weeks ago, we had someone ready to submit their first git-based patch. Unfortunately, we ran into some issues regarding line endings (CRLF vs. LF, etc.) because of the…
Pistos
  • 23,070
  • 14
  • 64
  • 77
13
votes
7 answers

How to ignore existing file in Git?

I need to work on file.txt locally and in Git, with different content. I want Git not to tell me that there have been changes to that file. Is this possible?
kassie
  • 727
  • 4
  • 11
  • 24
13
votes
1 answer

Intellij idea - how to show more revisions in VCS history?

In intellij Idea, I see only about past 600 revisions in the Changes->Repository tab. Is there some way to increase this number? In the settings, I've unchecked Version Control->Limit history by: and set Version Control->Background->VCS History…
NeplatnyUdaj
  • 6,052
  • 6
  • 43
  • 76
1 2 3
…
99 100