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
26
votes
4 answers

What is Mercurial bisect good for?

I've been reading about hg bisect and its interesting to be able to know which revision introduced a bug, but I'd like to know what people use this information for. The only thing I can think of is trying to narrow down which dates might need a data…
Asa Ayers
  • 4,854
  • 6
  • 40
  • 57
25
votes
3 answers

commit-pull-merge-push or pull-merge-commit-push?

We started using Mercurial a several weeks ago. Most developers follow this workflow: work on a feature commit -m "Worked on feature ABC" pull -u If branch merge commit -m "Merge" push Today, one of our developer suggested that we do: work on…
Sylvain
  • 19,099
  • 23
  • 96
  • 145
25
votes
4 answers

Git: merging public and private branches while while keeping certain files intact in both branches

I've read a few git questions here, but could not find an answer to this one: I have a public and a private branches where I want to allow certain files to diverge. Those are configuration files with passwords and my local customizations. I do want…
Evgeny
  • 10,698
  • 9
  • 60
  • 70
23
votes
7 answers

What DVCS support Unicode filenames?

I'm interested in trying out distributed version control systems. git sounds promising, but I saw a note somewhere for the Windows port of git that says "don't use non-ASCII filenames". I can't find that now, but there is this link. It's put me off…
Craig McQueen
  • 41,871
  • 30
  • 130
  • 181
23
votes
2 answers

What are the advantages of a rebase over a merge in git?

In this article, the author explains rebasing with this diagram: Rebase: If you have not yet published your branch, or have clearly communicated that others should not base their work on it, you have an alternative. You can rebase your…
Lazer
  • 90,700
  • 113
  • 281
  • 364
22
votes
5 answers

How to automatically merge .hgtags in Mercurial?

I have a script running some Mercurial commands in non-interactive mode on a build server. One of the commands merges two branches and there is always a conflict in the .hgtags file during the merge because of the way the build scripts are set…
Alexey Blinov
  • 1,684
  • 3
  • 17
  • 25
22
votes
10 answers

Sell me distributed revision control

I know 1000s of similar topics floating around. I read at lest 5 threads here in SO But why am I still not convinced about DVCS? I have only following questions (note that I am selfishly worried only about Java projects) What is the advantage or…
ring bearer
  • 20,383
  • 7
  • 59
  • 72
21
votes
1 answer

How can I host a Mercurial repository for several users myself?

There are a number of hosting services for git, Mercurial, etc. I need to host my own, because some of the data we want to keep there is of a sensitive nature, and we cannot move it off-site. I need to host a Mercurial repository on a server so that…
Robert Kosara
  • 583
  • 4
  • 10
21
votes
2 answers

Using Mercurial locally, only with Subversion server

We are using a Subversion server at my job for source control. I was thinking that rather than keeping up with my own branch, I would run Mercurial on my workstation, commit locally, and then commit to the Subversion trunk whenever I’m done with…
Mark Roddy
  • 27,122
  • 19
  • 67
  • 71
21
votes
5 answers

In Mercurial (hg), how do you see a list of files that will be pushed if an "hg push" is issued?

We can see all the changesets and the files involved using hg outgoing -v but the filenames are all scattered in the list of changesets. Is there a way to just see a list of all the files that will go out if hg push is issued?
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
21
votes
1 answer

Prevent commits in a local branch

In my local git tree I pull commits from the "master" branch in the repository, but all development is done in a different branch, and pushed in a different branch too. I would like to avoid mistakes and prevent accidental commits in my local…
Jellby
  • 2,360
  • 3
  • 27
  • 56
21
votes
5 answers

Git equivalent of "hg id"?

Does Git have any command equivalent to Mercurial's "hg id"? I.e. a command that prints the parent commit's hash and a plus sign if there are changes in the working directory?
Kostas
  • 1,292
  • 1
  • 13
  • 20
20
votes
2 answers

How do closed branches affect Mercurial performance?

I've noticed that some answers to questions about branch names quote the Mercurial wiki to indicate that the branch-per-feature or branch-per-bug naming conventions may cause performance problems. Does the ability to mark branches as closed with the…
Chris Phillips
  • 11,607
  • 3
  • 34
  • 45
20
votes
8 answers

DVCS Choices - What's good for Windows?

So I want to get a project on a distributed version control system, such as mercurial, git, or bazaar. The catch is that I need the Windows support to be good, i.e. no instructions that start off with "install cygwin...". Now I've heard that git's…
C Hogg
  • 1,001
  • 10
  • 15
19
votes
6 answers

Moving from Visual Sourcesafe to Mercurial

What's the best way to move a Visual Sourcesafe repository to Mercurial (I'm interested in retaining all history)?
David Coufal
  • 6,021
  • 5
  • 28
  • 30