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
11
votes
2 answers

.hgignore syntax for ignoring only files, not directories?

I have a problem which I can't seem to understand. I'm using TortoiseHg (version 0.7.5) on Windows but on Linux I have the same problem. Here it is: My .hgignore file: syntax: regexp ^[^\\/]+$ What I'm trying to achieve is to add to the ignore list…
INS
  • 10,594
  • 7
  • 58
  • 89
10
votes
2 answers

Is it safe to use the same ignores file for Git, Mercurial, and Bazaar?

Git, Mercurial, and Bazaar all seem to have similar formats for their ignore file (.gitignore, .hgignore, .bzrignore [see also bzr patterns]). In order to improve synchronization of the global ignore files, would it be safe to use one as an actual…
gotgenes
  • 38,661
  • 28
  • 100
  • 128
10
votes
1 answer

Mercurial: check whether last pull/update introduced changes

I am the process of writing an update script, which pulls the latest version of a number of repositories, and rebuilds the projects. I wanted to make the build conditional, so I tried hg pull -u && ant clean build and the variation hg pull; hg…
daniel kullmann
  • 13,653
  • 8
  • 51
  • 67
10
votes
1 answer

Change threshold on the similarity index for git merge with renaming involved (like -M[n] --find-renames[=n] on diff)

We have some configuration options for the rename detection heuristics during diff (log, show) and merge: diff.renameLimit The number of files to consider when performing the copy/rename detection; equivalent to the git diff option…
IgorK
  • 886
  • 9
  • 26
10
votes
2 answers

www.bitbucket.org certificate with fingerprint not verified issue while pushing changes

I am trying to push changes to a project I am contributing to. I have permissions to commit to the project and has a valid account in bitbucket. I am getting the below error while pushing the changes. Appreciate help on fixing this.
Aravind Yarram
  • 78,777
  • 46
  • 231
  • 327
10
votes
7 answers

Why should a business use distributed version control?

It seems that many people read about distributed version control and implicitly understand why it is a good thing for open source development, with many distributed developers all acting independently and in accordance with their own choices instead…
skiphoppy
  • 97,646
  • 72
  • 174
  • 218
10
votes
1 answer

How to deal with Git submodules on a repo that is converted to Mercurial

Here goes: $ cat .gitmodules [submodule "utils/external/firepython"] path = utils/external/firepython url = git://github.com/darwin/firepython.git [submodule "utils/external/textile"] path = utils/external/textile url =…
tshepang
  • 12,111
  • 21
  • 91
  • 136
10
votes
5 answers

How do I merge SSIS package files?

I am wondering if anyone has any advice on merging SSIS's dtsx files. Here's the problems I see that make merging difficult: They are xml which can already be a pain for merging. They can have embedded C# scripts in which case they will have both…
ZombieDev
  • 959
  • 1
  • 10
  • 25
10
votes
3 answers

Can I make an older revision the tip and push (using Mercurial)?

Say if I have a good revision: 3200. Then I want to test something, and since it has 10 lines of change, and I need to remove a few lines, even though I am still testing I commit first, and after some changes, commit again, and let's say, I did 6…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
10
votes
5 answers

Combination of incoming + outgoing + status?

Is there an hg command that will combine hg incoming + hg outgoing + hg status? This would tell you if there's anything remote that needs to come in, anything committed locally that needs to go out, or any local changes that need to be committed.
Marcus Leon
  • 55,199
  • 118
  • 297
  • 429
10
votes
5 answers

Mercurial Release Management

I am using mercurial for source control. I want to have a main dev branch, and then have points in time that align with say "v1.0" "v1.01" and "v2.0", so that at any time I can pull down say "v2.0" and crush some bugs on it. I have heard some people…
Jade Somath
  • 173
  • 4
10
votes
10 answers

Does any Version Control System like SVN, Git, or Mercurial let you "keep latest version" but not the revisions? (such as for binary files)

In our project files, if there are binary files, such as .doc, .xls, .jpg, and we choose to not keep their past revisions (just keeping a latest version is ok), is there a way to tell SVN, Git, or Mercurial or some other tool to skip the revisions…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
10
votes
5 answers

Can GIT, Mercurial, SVN, or other version control tools work well when project tree has binary files?

Sometimes our project tree can have binary files, such as jpg, png, doc, xls, or pdf. Can GIT, Mercurial, SVN, or other tools do a good job when only part of a binary file is changed? For example, if the spec is written in .doc and it is part of…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
10
votes
3 answers

Is there a difference between `bzr clone`, `bzr branch` and `bzr checkout`?

Obviously bzr clone, bzr branch and bzr checkout all do the same thing when given an URL as parameter and executed in a non-bzr directory. Is there any difference for later Bazaar workflow? i.e. bzr commit, bzr update and friends.
knittl
  • 246,190
  • 53
  • 318
  • 364
10
votes
7 answers

Does a Distributed Version Control System really have no centralised repository?

It might seem a silly question, but how do you get a working drectory set up without a server to check out from? And how does a business keep a safe backed up copy of the repo? I assume then there must be a central repo... but then how exactly is it…
Mr. Boy
  • 60,845
  • 93
  • 320
  • 589