I need to convert a mercurial project to a git project but I would like to keep the commit history intact My current solution was to just remove hg related files and then git init amp amp add manually the files I needed but that would not keep the history Are there any solutions to this

If you want to import your existing mercurial repository into a GitHub repository you can now simply use GitHub Importer available here Login required No more messing around with fast-export etc although its a very good tool You will get all your commits branches and tags intact One more cool thing is that you can change the author s email-id as well Check out below screenshots

Some notes of my experience converting Mercurial to Git 1 hg-fast-export Using hg-fast-export failed and I needed --force as noted above Next I got this error error cannot lock ref refs heads stable refs heads stable sub-branch-name exists cannot create refs heads stable Upon completion of the hg-fast-export I ended up with an amputated repo I think that this repo had a good few orphaned branches and that hg-fast-export needs a somewhat idealised repo This all seemed a bit rough around the edges so I moved on to Kiln Harmony http blog fogcreek com announcing-kiln-harmony-the-future-of-dvcs 2 Kiln Kiln Harmony does not appear to exist on a free tier account as suggested above I could choose between Git-only and Mercurial-only repos and there is no option to switch I raised a support ticket and will share the result if they reply 3 hg-git The Hg-Git mercurial plugin http hg-git github io did work for me FYI on Mac OSX I installed hg-git via macports as follows sudo port install python27 sudo port select --set python python27 sudo port install py27-hggit vi hgrc hgrc needs these lines ui username Name Surname lt me mydomain com gt extensions hgext bookmarks hggit I then had success with hg push git ssh git bitbucket org myaccount myrepo git 4 Caveat Know your repo All the above are blunt instruments and I only pushed ahead because it took enough time to get the team to use git properly Upon first pushing the project per 3 I ended up with all new changes missing This is because this line of code must be viewed as a guide only hg bookmark -r default master make a bookmark of master for default so a ref gets created The theory is that the default branch can be deemed to be master when pushing to git and in my case I inherited a repo where they used stable as the equivalent of master Moreover I also discovered that the tip of the repo was a hotfix not yet merged with the stable branch Without properly understanding both Mercurial and the repo to be converted you are probably better off not doing the conversion I did the following in order to get the repo ready for a second conversion attempt hg update -C stable hg merge stable hotfix-feature hg ci -m Merge with stable branch hg push git ssh git bitbucket org myaccount myrepo git After this I had a verifiably equivalent project in git however all the orphaned branches I mentioned earlier are gone I don t think that is too serious but I may well live to regret this as an oversight Therefore my final thought is to keep the original anyway Edit If you just want the latest commit in git this is simpler than the above merge hg book -r tip master hg push git ssh git bitbucket org myaccount myrepo git

Ok I finally worked this out This is using TortoiseHg on Windows If you re not using that you can do it on the command line Install TortoiseHg Right click an empty space in explorer and go to the TortoiseHg settings Enable hggit Open a command line enter an empty directory git init --bare git If you don t use a bare repo you ll get an error like abort git remote error refs heads master failed to update cd to your Mercurial repository hg bookmarks hg hg push c path to your git repo In the Git directory git config --bool core bare false Don t ask me why Something about work trees Git is seriously unfriendly I swear writing the actual code is easier than using Git Hopefully it will work and then you can push from that new git repo to a non-bare one

You can try using fast-export cd git clone https github com frej fast-export git git init git repo cd git repo fast-export hg-fast-export sh -r path to old mercurial repo git checkout HEAD Also have a look at this SO question If you re using Mercurial version below 4 6 adrihanu got your back As he stated in his comment In case you use Mercurial lt 4 6 and you got revsymbol not found error You need to update your Mercurial or downgrade fast-export by running git checkout tags v180317 inside fast-export directory

This would be better as a comment sorry I do not have commenting permissions mar10 comment was the missing piece I needed to do this Note that path to old mercurial repo must be a path on the file system not a URL so you have to clone the original repository before mar10 Dec 27 13 at 16 30 This comment was in regards to the answer that solved this for me https stackoverflow com a 10710294 2148757 which is the same answer as the one marked correct here https stackoverflow com a 16037861 2148757 This moved our hg project to git with the commit history intact

Another option is to create a free Kiln account -- kiln round trips between git and hg with 100 metadata retention so you can use it for a one time convert or use it to access a repository using whichever client you prefer

I had a similar task to do but it contained some aspects that were not sufficiently covered by the other answers here I wanted to convert all in my case two or in general more than one branches of my repo I had non-ASCII and being a Windows user non-UTF8-encoded characters for the curious German umlaute in my commit messages and file names I did not try fast-export and hg-fast-export since they require that you have Python and some Mercurial Python modules on your machine which I didn t have I did try hg-init with TortoiseHG and this answer gave me a good start But it looked like it only converts the current branch not all at once So I read the hg-init docs and this blog post and added git branch bookmark suffix bookmark to my mercurial ini and did hg bookmarks -r default master hg bookmarks -r my branch my branch bookmark hg gexport Repeat the 2nd line for every branch you want to convert and repeat it again if you should happen to do another commit before executing the 3rd line This creates a folder git within hg which turns out to be a bare Git repo with all the exported branches I could clone this repo and had a working copy as desired Or almost Running git status on my working copy showed all files with non-ASCII characters in their names as untracked files So I continued researching and followed this advice git rm -rf --cached git add --all git commit And finally the repo was ready to be pushed up to Bitbucket - I also tried the Github importer as mentioned in this answer I used Bitbucket as the source system and Github did quite a good job i e it converted all branches automatically However it showed -characters for all non-ASCII characters in my commit messages Web-UI and locally and filenames Web-UI only and while I could fix the filenames as described above I had no idea what to do with the commit messages and so I d prefer the hg-init approach Without the encoding issue the Github importer would have been a perfect and fast solution as long as you have a paid Github account or can tolerate that your repo is public for as long as it takes to pull it from Github to your local machine So it looked like before I discovered that I have to bookmark all the branches I want to export If you do and push to a bare repo like the linked answer says you get all the branches

[git] Convert Mercurial project to Git

From:

http://hivelogic.com/articles/converting-from-mercurial-to-git

Migrating

It’s a relatively simple process. First we download fast-export (the best way is via its Git repository, which I’ll clone right to the desktop), then we create a new git repository, perform the migration, and check out the HEAD. On the command line, it goes like this:

cd ~/Desktop
git clone git://repo.or.cz/fast-export.git
git init git_repo
cd git_repo
~/Desktop/fast-export/hg-fast-export.sh -r /path/to/old/mercurial_repo
git checkout HEAD

You should see a long listing of commits fly by as your project is migrated after running fast-export. If you see errors, they are likely related to an improperly specified Python path (see the note above and customize for your system).

That’s it, you’re done.

Examples related to git

• Does the target directory for a git clone have to match the repo name? • Git fatal: protocol 'https' is not supported • Git is not working after macOS Update (xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools) • git clone: Authentication failed for <URL> • destination path already exists and is not an empty directory • SSL_connect: SSL_ERROR_SYSCALL in connection to github.com:443 • GitLab remote: HTTP Basic: Access denied and fatal Authentication • How can I switch to another branch in git? • VS 2017 Git Local Commit DB.lock error on every commit • How to remove an unpushed outgoing commit in Visual Studio?

Examples related to mercurial

• Convert Mercurial project to Git • Mercurial: how to amend the last commit? • Discard all and get clean copy of latest revision? • Mercurial undo last commit • How to save username and password with Mercurial? • Mercurial — revert back to old version and continue from there • Is there any way to delete local commits in Mercurial? • How to correctly close a feature branch in Mercurial? • How can I switch to a tag/branch in hg? • What is the difference between hg forget and hg remove?