Check out the convert extension, particularly the –filemap option. Enable by adding the following to mercurial.ini: [extensions] convert = Create a map of files to exclude: exclude path/to/file1 exclude path/to/file2 Then convert the repo: hg convert srcrepo destrepo –filemap <map> Note there is a bug in Mercurial 2.1.1 causing an error with the above command: … Read more
Git does not support partial checkouts, so the submodule must point to a complete repository. This thread on the Git mail list provides some background information. This article from Panther Software offers some insight from someone else trying to accomplish a similar goal (i.e. replicate svn:externals using Git). If both projects are under your control, … Read more
The cat command can be used to retrieve any revision of a file: $ hg cat -r 10 myfile.pls You can redirect the output to another file with $ hg cat -r 10 myfile.pls > old.pls or by using the –output flag. If you need to do this for several files, then take a look … Read more
Try the newly released MacHg. It uses the native GUI toolkit for Mac and comes with its own bundled version of Mercurial. There are many more screenshots available.
A Mercurial repository gets its identity when you make the first commit in it. When you create a new repository on Bitbucket, you create an empty repository with no identity. When you clone this repository to machine A and make a commit and push it back, then you brand the repository. If you have cloned … Read more
Starting with Mercurial 2.1 (released in February 2012), you can mark your changesets secret to keep them from being pushed to another repository. You use the new hg phase command to do this: $ hg phase –force –secret . This mark the current working directory parent revision (.) as being in the secret phase. Secret … Read more
Try hg status and look for files in state ! (missing). The cause is that one of the files which is part of the merge has been deleted. Undelete the file and try again.
To highlight an answer in a comment for Hg 1.1+: For Hg 1.1+ fix the file by hand and then do hg resolve -m test.h to mark the file as merged.
I’ve been using Mercurial both at work and in my own personal projects, and I am really happy with it. The advantages I see are: Local version control. Sometimes I’m working on something, and I want to keep a version history on it, but I’m not ready to push it to the central repositories. With … Read more
if you are new to them both then it depends on what you need. a free github account doesn’t include any private repositories whereas bitbucket free account gives you unlimited private repositories. this was the selling thing for me – I didnt want to initially pay for github as i was trialing it but i … Read more