mercurial

Review Board workflow for Mercurial repository

At my company we are trying to add code reviewing practices into our development process and for that purpose we decided to use Review Board. While Review Board should work out of the box for Subversion the workflow for Mercurial looks a little bit involved. Firstly it seems that only post reviewing(via post-review script) is supported ...

Viewing result of Mercurial in/out commands in external diff viewer

I do a lot of code reviews mostly using "hg in -p /path/to/repo" command and it would be very nice if its output could be viewed in some external program(e.g vimdiff). Is there any way to achieve that? ...

Mercurial cherry picking changes for commit

Say, I made many changes to my code and only need to commit a few of those changes. Is there a way to do it in mercurial? I know that darcs has a feature like this one. I know "hg transplant" can do this between branches, but I need something like this for committing code in the present branch and not when adding change sets from some o...

Version-controlled extension configuration in Mercurial

Normally, I would enable extensions by adding the following to .hg/hgrc: [extensions] hgext.win32text= [encode] ** = cleverencode: [decode] ** = cleverdecode: However, I want this configuration to be versioned, i.e. part of the repository, so that it is enabled for anyone else (coworkers, build machines) cloning the repository. Note ...

Migrating from clearcase to mercurial

What tools are available to migrate from clearcase to mercurial? Is it possible to move history? What kind of limitations are there? ...

Changing Mercurial "Default" Parent URL

Let's say I have a Mercurial repository and I'm pulling from a default parent URL (the source I cloned it from). Now I want to change the default parent URL (hostname change, or it was copied to another machine, etc.). Is there a way to do this, or do I have to re-clone from the new URL? ...

Deploying only changed part of a website with git to ftp (svn2web for git)

I'm having a website with many big images file. The source (as well as the images) is maintained with git. I wish to deploy that via ftp to a bluehost-like cheap server. I do not wish to deploy all the website each time (so that I won't have to upload too many unchanged files over and over), but to do roughly the following: In a git r...

Can I set allow_push globally for all Mercurial repos servied by one hgwebdir?

Our company has a large number of projects that have gone from VSS to Subversion, and now I'd like to move them to Mercurial. Thus far, I've gotten hgwebdir.cgi working (Apache on Windows). At the moment I have to add allow_push = * to the .hg/hgrc of each repo in order to push changes. Is it possible to set this option globally on th...

Mercurial Web Interface Broken Links

I'm installing mercurial on a W2K IIS 6 server. I've got it to the point where I can browse a list of my repositories at http://localhost/hgrepo/hgwebdir.py. My hgweb.config contains [path]hgrepo = c:\hgrepositories** But when I click on one of the repository name. In this case its Babbet, I get the same page but when I examine the a...

Mercurial: Revert a single hunk

How do I revert a single hunk in Mercurial, similar to the way it's done in darcs, i.e. it asks me for each hunk and file whether I want to revert it? Is it possible using TortoiseHg? Thanks ...

php long running script

how can I provide feedback for a shell command that may run for quite some time? for example, i need a script that does hg clone ... then in my php i make a call exec('hg clone ...', $output, $return_value); but I wouldn't be able to get the output before the command actually ends. It is stated in the documentation ( http://www.php.n...

Git interoperability with a Mercurial Repository

I use GIT on a Mac. Enough said. I have the tools, I have the experience. And I want to continue to use it. No wars here... The problem is always with interoperability. Most people use SVN, which is great for me. Git SVN works out of the box, and is a no frills solution. People can continue happily use SVN and I don't loose my workflow ...

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 a number of people can access it to both pull changes and push their own work. There nee...

Is there an ignore-on-commit option in mercurial?

Is there any way to ignore changes to some files on a commit with mercurial? I've got a specific situation where we have a default oracle tnsnames.ora file that points to 127.0.0.1, but some developers will modify it to point to other systems, but we don't want to change the default file. In subversion, I've simple added this to the i...

In short, what are the advantages of git and mercurial over subversion?

Hi, Can someone tell me what the hype is over Git and Mercurial over Subversion? ...

Mercurial: Named Branches vs Multiple Repositories

We're currently using subversion on a relatively large codebase. Each release gets its own branch, and fixes are performed against the trunk and migrated into release branches using svnmerge.py I believe the time has come to move on to better source control, and I've been toying with Mercurial for a while. There seems to be two schools...

Pushing updates to a pruned Mercurial branch

I have two related repositories, a master, which contains a number of sensitive files which must not be leaked, and a 'public' version, created with hg convert with --filemap to exclude the sensitive files and directories. I would like further updates to the master that don't affect the sensitive files to be pushable to the slave, and u...

"Case folding" error trying to clone a mercurial repo

I try to clone a local mercurial repository on windows. I get this error: C:\temp\toolkit1.1>hg clone \src\toolkit destination directory: toolkit updating working directory abort: case-folding collision between sdk/Api.h and sdk/api.h It looks like I changed capitalization of API.H at some point, but I don't know how to r...

Mercurial - cleverencode - cleverdecode - multiple file patterns - mercurial.ini

How do I specify the CRLF encode/decode option in mercurial.ini in Windows? The documentation gives the following options: [extensions] win32text = [decode] ** = cleverdecode: [encode] ** = cleverencode: for all files and, [extensions] win32text = [decode] **.txt = cleverdecode: [encode] **.txt= cleverencode: for one kind of files...

How do I suppress keyword expansion in Starteam at the client level to enable local mirroring to DVCS?

I am trying to mirror my corporate Starteam CM server with a local distributed version controls system (Mercurial). I am running into problems with seeing many changes due to Starteam's keyword expansion on checkout feature. For example, the server is setup to expand $History to a log of each checkins comments and other metadata. Thes...