From my experience with distributed version control systems (DVCS) like git and mercurial in open source projects, most setup models use a centralized setup for their project (think GitHub). When introducing distributed VCS into a company, do you have a centralized setup model? ...
Is there any way to take complete manual control over the merge process in Mercurial? I want to be able to choose direction of file-merge, even for files without conflicts. Is that possible? ...
The mercurial wiki has hints on how to display the changesets a bundle would add to a given repository. Is there a possibility to display the changesets (and log messages) contained in a bundle independent of a specific repository? EDIT: The reason for my question is that sometimes I have one repository at work and one at home. I use b...
I'm a single developer using Mercurial to create a program. I have so far committed at every step of developing, and I have messed things up and want to work on something else. How shall I go to a previous state (ie. rollback) and then create a branch, maintaining the newer states? Does rollback ever delete anything? Should that be a...
$ mkdir foo $ cd foo $ hg init . $ hg log abort: Is a directory $ hg history abort: Is a directory Darwin Host.local 9.6.1 Darwin Kernel Version 9.6.1: Wed Dec 10 10:38:33 PST 2008; root:xnu-1228.9.75~3/RELEASE_I386 i386 $ hg --version Mercurial Distributed SCM (version 1.2.1) $ python --version Python 2.5.4 (all installed via macpo...
I didn't set the username on my development computer and made a few commits. Can I retroactively change the username so it's clear who committed these changesets? ...
Hi gurus, We're using CakePHP for a new application, and we use Mercurial as the source control tool. (Mercurial uses one .hgignore file in the root directory, unlike (for example) CVS that uses .cvsignore in any directory.) I'd like to exclude the content of the app/tmp/ directory from the source control (since they change all the tim...
I've been using mercurial for a little while, but mainly for my own usage. Now though, I have a project I'm working on where two of us are building the same project, and we will probably be modifiying each other's files. I would like to setup a mercurial repo on a server, make that repo the "server", so my changes and the other editor'...
I have a git repository with few branches and dangling commits. I would like to search all such commits in repository for a specific string. I know how to get a log of all commits in history, but these don't include branches or dangling blobs, just HEAD's history. I want to get them all, to find a specific commit that got misplaced. I ...
My workflow usually involves me making multiple changes to a file, each of which belongs to it's own conceptual unit of change across the project (= commit). What I would like to be able to do is to add certain diffs (either a whole file, or only certain lines of a file) to a pending commit (which would probably have to be named) and to...
I have developed a simple library in Ruby and need to use this in several Rails applications (some of which are not built yet). What is the best way to easily add this Ruby library to several Rails applications as and when required? Our team is running Ubuntu and our repository is Mercurial. Should I use a... Rails plugin? This would ...
Is it possible to create a non-visible branch in git or mercurial I can use as backup? Eg at the end of the day I have unfinished work (may even be left with syntax errors) but I want it to be backed up in the repository online, without annoying others about the mess that's left. ...
I've put site directory created by django-admin startproject under version control (Mercurial). Let's say, the site is called frobnicator. Now I want to make some serious refactoring, so I clone the site using command hg clone frobnicator frobnicator-refactoring` but ROOT_URLCONF in settings.py still says frobnicator.urls. Is there ...
I've recently started getting into Git on a personal project, and I can see how a DVCS might benefit us at work (which is a large enterprise software company, currently running Perforce). Feature work in my team for example mostly consists of developers creating their own branches; sometimes these are shared between small teams of devel...
I'm used to git, where you can run gitk and get something like the following: Here you can see that there are a couple of changes that need pushing to the remote branch. Alternatively, I can use git log --decorate and the output would be: b8c2926... (refs/heads/next) Update instructions 6d9f914... Add a first go at generic x compilin...
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 using: hg update -C 19 hg merge 18 I can't figure out how to resolve this. Google sea...
It is possible to retrieve the local branches from a local repository with hg branches. Is it possible to do this also with a remote repository programatically? ...
We are currently using VSS for version control. Quite few of our developers are interested in a distributed model (And want to get rid of VSS). Our network is full of Windows machines and while our IT department has experience maintaining Linux machines they would prefer not to. What DVCS systems can host their central repository on Win...
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 whatever feature I’m working on. From my understanding of DVCS this is theoretically possib...
In the CVS/SVN world, there are various statistics/metrics tools. E.G., StatCVS, StatSVN. There are others I've seen. However, I've not seen similar statistics and visualizations for Mercurial(aka hg). (1) Are there any out there? (2) If so, what are they? Thanks. ...