mercurial

Mercurial: keep 2 branches in sync but with certain persistent differences?

I'm a web developer working on my own using django, and I'm trying to get my head round how best to deploy sites using mercurial. What I'd like to have is to be able to keep one repository that I can use for both production and development work. There will always be some differences between production/development (e.g. they might use dif...

Which has better Eclipse support: git or Mercurial

I work in a team of Java-developers who are very familiar with Eclipse. Most of the team uses Windows. We are switching our main project from CVS into something newer. Subversion seems already old and not really that much better than CVS. We are really interested in distributed version control systems, mainly Mercurial and git. Which of ...

How does mercurial compress files in repository?

I'm seeing that mercurial efficiently compresses the files in repository (repo/.hg/store/data) Does anybody know what kind of compression is used for repository files? Thanks. ...

Can Mercurial be made to preserve file permissions?

I've seen a number of blog posts, and have experienced for myself, that Mercurial does not preserve the permissions on files pushed from one repo to another. Does anyone know of a Mercurial extension that would preserve the permissions? (I'm assuming it can't be done wit a hook, because what does a hook know about permissions at the or...

Looking for Alternative to TortoiseHG under Win32

I'm looking for an alternative GUI client for Mercurial that works on Win32 and that is accessible to a screen reader, specifically, JAWS for Windows. TortoiseHG doesn't work for me because of its reliance on GTK/Tkinter under Python. Something programmed in WXPython (or any other WX equivalent), as well as any app programmed using sta...

TortoiseHg Copy Similarity feature

When committing changes to Mercurial, it can auto-detect move/copy/renames by using the command hg addremove -similarity 100 The number after similarity indicates how similar two files need to be from 0-100% for mercurial to decide its a move, copy or rename instead of just a new file. This is a great feature. Can TortoiseHg do t...

Is it possible to do a partial clone/branch with either bazaar, mercurial or git?

Suppose I have a project in source control with a lot of subdirectories, many of which I don't need at the moment. I would like to create a working copy containing only some of the entire tree, which still maintaining the ability to make changes, commit them, and push them back up. Is this possible and if so, how can I do it? I'm stil...

Configuring Mercurial - FileMerge for Apple Mac OS X

How do I configure Apple's FileMerge program to function as Mercurial's merge tool? I have my .hgrc file setup in my home directory and I simply want to configure FileMerge as the merge program. ...

Mercurial suddenly thinks all files have changed - waiting for lock on working directory

I've been using Mercurial v 1.1 for several months to version documents and other files. Yesterday it suddenly failed with the message: waiting for lock on working directory This happens in all projects I have under .hg control. Mercurial also thinks that all files in all projects have changed. There is no .hg/store/lock file in th...

Examining a changeset in HG

How can I examine a changeset in mercurial without looking up its parent? In mercurial, what's the equivalent of git show HEAD^ Git-show gives the changeset metadata and the diff as well. ...

Multiple simultaneous version control systems?

I'm relatively new to version control, and so far only have experience working with Subversion using TortoiseSVN/VisualSVN. I've been reading about other types of VCS (git, mercurial, etc), and am considering trying them out - however, many of the arguments for or against a particular VCS seem like they largely come down to subjective pr...

Mercurial from Subversion: moves, renames and tags

I have a subversion repo with the following layout: svnrepo/projectA/trunk svnrepo/projectA/tags svnrepo/projectA/branches svnrepo/projectB/trunk svnrepo/projectB/tags svnrepo/projectB/branches which I would like to move to a mercurial repo with a revised layout: hgrepo/projectA hgrepo/projectB What is the best way of doing this? S...

Splitting a patch in two (ideally in Vim)

I have a patch which I'd like to split into two patches. I need to split the patch with per-line granularity -- I can't just split the hunks up into two separate files. I could use Emacs diff mode, but I'm a Vim user, and I don't want to learn Emacs. I'm managing this patch in Mercurial Queues, and I've been using the crecord plugin, ...

TortoiseHg without context menu commands

TortoiseHG's context menu entries totally mess up Windows 7 explorer's context menu's appearance, and I can get by fine with the hg command line tools. However Tortoise Overlay icons are must-have for me. How can I disable TortoiseHg's context menu commands but still have the Tortoise Overlay icons appear in hg repository folders? ...

How to let Mercurial ignore every thing except *.cs file?

I started a project and added it to hg, but I want to take *.cs file under version control only, so,i have to add bin, obj, sln, suo,_resharper folder etc to ignore pattern, ,how to let hg only monitor certain kind of file like white list? How to do that in Subversion? ...

Mercurial authenticated pushing problem

We have central repository via http on Apache with digest authentication for two users 'One' and 'Two'. User 'One' can do: hg commit -uTwo -mText hg push http://central-repo/hg/project How to prevent that fake on the central repository? Or how to know who makes that push to the central repository? ...

Maintaining development branches where one branch is a subset of another branch

Background: I've inherited some MATLAB code to analyze data for my Ph.D. research. To help me better understand the code, I've pared the code down to the minimum subset of files required to run the code for a sample test case. Question: I would like to commit this code to a version control system as two branches, a master branch contai...

What version control system is best designed to *prevent* concurrent editing?

We've been using CVS (with TortoiseCVS interface) for years for both source control and wide-ranging document control (including binaries such as Word, Excel, Framemaker, test data, simulation results, etc.). Unlike typical version control systems, 99% of the time we want to prevent concurrent editing - when a user starts editing a file...

Merge tip from an unrelated repository with Mercurial

I have two unrelated repositories 'public' and 'develop': prj/ public/ develop/ 'develop' has lots of commits, 'cause here is where I work. Maybe even multiple heads From time to time I want publish a snapshot of the development repository. From the public folder I could do this: >hg pull -f ../develop >hg merge >hg commit -m "a...

Diverge a Mercurial Repository in to two seperate repositories

Like many people, I have several SVN repositories that contains several projects. I've decided to convert one of these repositories to Mercurial for several reasons. I've successfully converted the repository using instructions located here. The new hg repo includes everything; all history and the correct tags. The conversion worked gr...