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
51
votes
5 answers

Is there a way to remove the history for a single file in Mercurial?

I think I already know the answer to this but thought I would ask anyway: We have a file that got added to a Mercurial repository with sensitive information in it. Is there any way to remove that file along with its change history without removing…
Matt Spradley
  • 7,854
  • 9
  • 31
  • 40
50
votes
1 answer

how to make pull requests *without* a github account?

One of the goals of git is to be decentralized. If Github is to be the ... hub of git, then maybe it could take into account that there are other hubs out there, and allow pull requests to happen on git URLs that are not hosted on github. The…
anarcat
  • 5,605
  • 4
  • 32
  • 38
48
votes
9 answers

What makes merging in DVCS easy?

I read at Joel on Software: With distributed version control, the distributed part is actually not the most interesting part. The interesting part is that these systems think in terms of changes, not in terms of versions. and at…
Afriza N. Arief
  • 7,696
  • 5
  • 47
  • 74
48
votes
4 answers

Git remove directory

I've got a repository on GitHub (http://github.com/hrickards/PHP-Crypto) for a little project me and a couple of others are working on. My development environment is Aptana Studio, and I use the EGit plugin as Aptana is basically Eclipse underneath.…
hrickards
  • 1,061
  • 2
  • 9
  • 20
45
votes
5 answers

Why doesn't git commit -a add new files?

I'm a bit new to git, and I fail to understand why git commit -a only stages changed and deleted files but not new files. Can anyone explain why is it like this, and why there is no other commit flag to enable adding files and committing in one…
splintor
  • 9,924
  • 6
  • 74
  • 89
45
votes
8 answers

Can I clone part of a Mercurial repository?

Is it possible to clone part of a Mercurial repository? Let's say the repository is quite large, or contains multiple projects, or multiple branches. Can I clone only part of the repository? E.g. in Subversion, you might have trunk and branches. If…
Nick
  • 27,566
  • 12
  • 60
  • 72
42
votes
5 answers

Reasons for not working on the master branch in Git

So, I'm fairly new to git and I've after a bit of reading around over the last couple of weeks I've read a few people saying that the master branch shouldn't be changed but rather branched from and then merged to. I'm happy enough to work with…
Mark Williams
  • 1,240
  • 2
  • 13
  • 28
42
votes
6 answers

Why Kiln is based on Mercurial, and not other (D)VCS

What were the reason for chosing Mercurial as a basis of FogCreek Kiln, a source control management system with tightly integrated code review, and FogBugz integration? Why Mercurial, and not other (distributed) version control system, like Bazaar,…
Jakub Narębski
  • 309,089
  • 65
  • 217
  • 230
41
votes
3 answers

hg local ignore

I could have sworn there was a way to keep a local ignore file in an hg repo, i.e. a file similar in function to .hgignore, but not checked into the repo. This could be used to ignore changes to an IDE project file if different IDEs are being used,…
fakeleft
  • 2,830
  • 2
  • 30
  • 32
41
votes
4 answers

Comparing the pros and cons of Bitbucket to Github

Disclaimer: This is a subjective question. Please follow relevant guidelines. I am considering the migration of source code from a traditional VCS to a DVCS. Since having a decent GUI web-based frontend and workflow tools are a must, the two obvious…
Saul
  • 17,973
  • 8
  • 64
  • 88
37
votes
18 answers

Do you use distributed version control?

I'd like to hear from people who are using distributed version control (aka distributed revision control, decentralized version control) and how they are finding it. What are you using, Mercurial, Darcs, Git, Bazaar? Are you still using it? If…
Chris Blackwell
  • 9,189
  • 1
  • 25
  • 27
36
votes
3 answers

How to resolve merging conflicts in Mercurial (v1.0.2)?

I have a merging conflict, using Mercurial 1.0.2: merging test.h warning: conflicts during merge. merging test.h failed! 6 files updated, 0 files merged, 0 files removed, 1 files unresolved There are unresolved merges, you can redo the full merge…
lajos
  • 25,525
  • 19
  • 65
  • 75
35
votes
3 answers

Can I mark a branch as 'not going to push'?

I use named branches in Mercurial. In doing so I have created one branch called playground where I can try out various wacky experiments. I never intend to merge this branch into any others and I never want to push it to our main repository. Since…
George Mauer
  • 117,483
  • 131
  • 382
  • 612
35
votes
4 answers

Mercurial error: repository is unrelated

I've just started with Mercurial, I have a 'central' repository on Bitbucket which I cloned onto one machine and made changes and committed and pushed. I then cloned from Bitbucket to another machine committed and pushed which was fine. I then came…
frontendbeast
  • 1,043
  • 4
  • 13
  • 28
35
votes
3 answers

Mercurial - cannot commit merge with missing files error

I have done a 'hg merge' however when I attempt to do a 'hg commit -m "my msg.." I get the following error message : abort: cannot commit merge with missing files Can anyone explain how to fix this to allow the commit go through?
Zabs
  • 13,852
  • 45
  • 173
  • 297