Category Archives: Mercurial

Merging in mercurial with vimdiff

Put the lines below in .hg/hgrc file of a repository: [ui] merge = vimdiff [merge-tools] vimdiff.executable = vim vimdiff.args = -d $base $local $output $other +close +close Now whenever you do: hg pull hg update and if there are conflicting … Continue reading

Posted in Mercurial, Productivity, Programming, UNIX/Linux, Vim | Leave a comment

Installing extensions for Mercurial

Detailed instructions are here. Create forlder ~/.hgextensions Copy extesion files to this folder. Open ~/.hgrc Mercurial’s config file and add [extensions] section. It might look something like: At the moment of this post Kiln did not support SSH connection. Kilnauth … Continue reading

Posted in Mercurial, Productivity, Programming | Leave a comment

Basic Managing of Mercurial Repos with Bitbucket

1. Setting ssh. cd ~/.ssh ssh-keygen. Enter a phrase when requested. Then enter the file path. /home/your_user_name/ssh/id_rsa. After this steps file id_rsa.pub will be created. ssh-add ~/.ssh/id_rsa. This loads your default identity into ssh agent. Go to your Bitbucket Account/Manage … Continue reading

Posted in Bash, Mercurial, Programming | Tagged | Leave a comment