Questions tagged [dvcs]

DVCS stands for Distributed Version Control System. Use this tag for questions about DVCSes in general. If your question is about git, or another DVCS that has its own tag already, then use that tag instead of this one.

Distributed revision control system (DRCS), distributed version control or decentralized version control system (DVCS) keeps track of software revisions and allows many developers to work on a given project without necessarily being connected to a common network.

Most popular DVCS:

911 questions
12
votes
4 answers

git found out number of conflicts / list of conflicts in working folder

Is there any way to review list of conflicts (names of conflicting files and number of conflicts in it)? The only thing I have discovered is to review pre-created .git/MERGE_MSG file... but this is not what I really searching for...
shytikov
  • 9,155
  • 8
  • 56
  • 103
11
votes
4 answers

Centralized vs. Distributed version control security

As my company begins to further explore moving from centralized version control tools (CVS, SVN, Perforce and a host of others) to offering teams distributed version control tools (mercurial in our case) I've run into a problem: The Problem A…
Michael La Voie
  • 27,772
  • 14
  • 72
  • 92
11
votes
2 answers

What directory structure makes sense for DVCS such as git?

What I am used to: Archives on the servers (NY, IN, NC) On my development machine: A directory named ~/work Subdirectories named ~/work/NY/devproject, ~/work/NC/project etc Not infrequently, subdirectories named ~/work/NY/release/1.3/project,…
Thomas L Holaday
  • 13,614
  • 6
  • 40
  • 51
11
votes
1 answer

TFS with Mercurial source control

I must say, that I know almost nothing about TFS. But have worked with its source control system. For now our team uses Mercurial as source control system, but our managers want the all-in-one system to manage the projects. They want to use Team…
0x49D1
  • 8,505
  • 11
  • 76
  • 127
11
votes
5 answers

Any project hosting with a in-browser code editor like Google Code?

Google Code Project Hosting recently adapted CodeMirror to allow for quick in-browser editing of code in a repository. This seems extremely useful! Unfortunately not all of my projects are open source. Are there any other DVCS (Mercurial or Git)…
Ricket
  • 33,368
  • 30
  • 112
  • 143
11
votes
4 answers

Verify if a tag was done in the master branch

In this project I am working, we do deployments based on tags. Whilst it's obligatory that the tags are done against the master branch (after you merge the release there), sometimes by mistake someone can tag against a dev or release branch, which…
testTester
  • 2,371
  • 3
  • 18
  • 22
11
votes
1 answer

Is it possible to export from Fossil SCM into some other DVCS?

For many years I used Darcs as my only DVCS...some time ago I explored Monotone which I like as well. However, the main problem with both is the lack of complete hosting solutions. Fossil looks as interesting option (although we don't like its use…
gour
  • 967
  • 9
  • 22
11
votes
2 answers

In Mercurial, is there any way (aside from "Cherry picking") to push a changeset without also pushing changesets associated with a different head?

In the answer to this question, Ry4an states that "you cannot push Changeset2 without pushing Changeset1". This certainly makes sense if the repository looks like this: + Changeset2 | + Changeset1 | + Original However it doesn't seem to make as…
Richard J Foster
  • 4,278
  • 2
  • 32
  • 41
11
votes
7 answers

Distributed Version Control "killer applications"

Considering switching to Mercurial or Git? We are too. I'm currently studying the benefits of DVCS which turn out to be vast, lust and must. I would love to hear from the community typical usage patterns. Let's create a "Top N" productivity feature…
Maxim Veksler
  • 29,272
  • 38
  • 131
  • 151
11
votes
7 answers

Offline source control

I'm about to start a project where programmers will be contributing from their homes (much like stackoverflow was built) I want to use some centralized source control, but I don't want it to require the programmers to be online, and the server may…
juan
  • 80,295
  • 52
  • 162
  • 195
11
votes
2 answers

How do I get changes from my trunk into a branch?

I've just started using Git and find that whilst I am implementing a feature in a branch, I will encounter some bug that really needs to be pushed to the trunk as soon as possible. In order to do so, I use checkout to switch back to the trunk, make…
Rupert Madden-Abbott
  • 12,899
  • 14
  • 59
  • 74
11
votes
2 answers

Can Mercurial repositories be nested?

What happens if there is already a Mercurial repository at /User/peter/development and now I want to add a repository for /User/peter because I also want to version .bashrc, .profile, or maybe /User/peter/notes as well. Will having a repository…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
11
votes
6 answers

TortoiseHG: cannot partially commit a merge

I tried to merge two heads in Mercurial. After merging, I didn't commit and did some more changes. Then I tried to commit and got the following message: abort: cannot partially commit a merge (do not specify files or patterns) I'm using…
Roman Boiko
  • 3,576
  • 1
  • 25
  • 41
11
votes
10 answers

Distributed version control for HUGE projects - is it feasible?

We're pretty happy with SVN right now, but Joel's tutorial intrigued me. So I was wondering - would it be feasible in our situation too? The thing is - our SVN repository is HUGE. The software itself has a 15 years old legacy and has survived…
Vilx-
  • 104,512
  • 87
  • 279
  • 422
11
votes
1 answer

Advantages of GitHub over Bitbucket for Git Repositories

Now that Bitbucket also supports Git repositories, it seams to me that it is a good alternative to GitHub, especially since its free plan includes unlimited private repositories, which is not available on GitHub. Yet, GitHub seams much more…
rolve
  • 10,083
  • 4
  • 55
  • 75