mercurial

How do I unadd a not yet commited file I have added?

I typed in hg add and I am brand new to mercurial and the result of this was a bunch of dll's exe's pdb's etc all got added Nothing's been committed yet and I basically want to undo the add. the documentation for hg forget is not very clear not sure if that is want I want How do I undo the add before the next commit I do have some re...

Mercurial/Intellij9 hg4idea Error: cannot update with applied MQ patches, please use rebase

I am getting the following error when trying to update my project from Intellij 9 using hg4idea: Error: cannot update with applied MQ patches, please use rebase What does this mean? I have not created or applied any patches as far as I know. I can pull changes from my remote repository but cannot update the project from within Intelli...

What is your workflow to coordinate Pivotal Tracker with Mercurial?

I want to use Pivotal Tracker for a new project but I don't know how to use it with Mercurial to make it easy to go from one tool to the other. What workflow do you use to link user stories/feature in Pivotal Tracker with your DVCS (Mercurial/Git)? Thanks in advance for your advices. ...

Connect to mercurial via ssh on windows

Can anyone point me in the direction of a simple step by step guide as to how to connect to a mercurial repo via ssh on windows. Im really struggling to get my head around it, and so far i jus keep getting a string of errors. Any help would be appreciated. ...

Mirroring a project from bitbucket to github

Is there an efficient workflow to mirror a project that is mainly hosted on bitbucket, to github? ...

hg command for git bundle

In git, there is a command 'git bundle' which bundles a git repository into 1 big file. Is there the equivalent command for 'hg'? ...

HgWebDir push permission denied error

I have a new Fedora 12 server that I am attempting to set up Mercurial on. I have yum installed mercurial, and most things seem to work fine. However, after setting up hgwebdir.cgi through apache, I am unable to do an hg push to the only repo currently being hosted. The error I get back is: searching for changes abort: HTTP Error 500: P...

Hg: How to do a rebase like git's rebase

Hey guys, In Git I can do this: 1. Start working on new feature: $ git co -b newfeature-123 # (a local feature development branch) do a few commits (M, N, O) master A---B---C \ newfeature-123 M---N---O 2. Pull new changes from upstream master: $ git pull (master updated with ff-commits) master A---B---C---D---E--...

How do I git reset --hard HEAD on Mercurial?

I'm a Git user trying to use Mercurial. Here's what happened: I did a hg backout on a changeset I wanted to revert. That created a new head, so hg instructed me to merge (back to "default", I assume). After the merge, it told me I still had to commit. Then I noticed something I did wrong when resolving a conflict in the merge, and decid...

How to configure Mercurial to use Kompare when merging?

I've tried adding merge=kompare to my ~/.hgrc, but when I run hg merge, it runs kompare, but there's no UI to be seen. Hg says merging path/to/first-file and stays there, actionless. ...

XAMPP Mercurial installation on Windows Apache --> HgWebDir.cgi Script Error

I try to publish multiple existing mercurial repository-locations though XAMPP Apache via CGI Python script hgwebdir.cgi ... as in this tutorial http://mercurial.selenic.com/wiki/HgWebDirStepByStep I get the following error from the apache error logs, when I try to access the repository path with a browser: Premature end of script head...

Creating multiple heads in remote repository

We are looking to move our team (~10 developers) from SVN to mercurial. We are trying to figure out how to manage our workflow. In particular, we are trying to see if creating remote heads is the right solution. We currently have a very large repository with multiple, related projects. They share a lot of code, but pieces of the proj...

Showing renames in hg status?

I know that Mercurial can track renames of files, but how do I get it to show me renames instead of adds/removes when I do hg status? For instance, instead of: A bin/extract-csv-column.pl A bin/find-mirna-binding.pl A bin/xls2csv-separate-sheets.pl A lib/Text/CSV/Euclid.pm R src/extract-csv-column.pl R src/find-mirna-binding.pl R src/mo...

How to pull in upstream changes into a fork using Mercurial?

I've forked a Mercurial repository, and now I want to pull the changes from the main repository into my fork. If this were git, I would do something like... git remote add upstream <url> git pull upstream master How do I do this sort of thing in Mercurial? ...

hg: unknown command 'qimportbz'

I followed the instructions on how to setup qimportbz here; I'm on WinXP and instead of adding: [extensions] qimportbz = C:\mozilla\mercurial\qimportbz to a .hgrc file I updated a Mercurial.ini file which seems to be the correct file to add extensions to for me.. then when I run hg help qimportbz I see the help for the qimportbz cmd,...

Mercurial - How to stop tracking modified file but keep the first version in repository.

I create the hg repository with my source tree. I want to keep the first version of some files such as Makefile in the repository and then hg don't see it modified even through I modified it. Original problem is that ./configure usually modifies the Makefile but I don't want the build files to committed in the repository. So I want to k...

Installing Mercurial on Windows Apache XAMPP Tutorial

After asking this question (http://stackoverflow.com/questions/2675764/xampp-mercurial-installation-on-windows-apache-hgwebdir-cgi-script-error) and reading though the whole internet including this question (http://stackoverflow.com/questions/644322/how-do-i-get-mercurials-hgwebdir-working-on-windows) and all its links for about 10 hours...

How do I get mercurial to show the diff during `hg com`?

Is there a way to configure hg com so that in the commit message file that pops up in the external editor, instead of just showing which files were changed (in the HG: lines) it actually shows the full diff? I'd rather view the output and compose my commit message simultaneously from the comfort of my text editor as opposed to doing hg ...

Mercurial automated deployment

Hi all, Im in the process of looking for a way to streamline the deployment of one of our php web applications (if it works on this ill roll it out to other apps). I quite like the look of this: http://www.springloops.com/, but its SVN and were using mercurial. Unfortunately we have no shell access to our current server, so somethin...

Adding changes from one Mercurial repository to another

When changing the VCS for my project FakeItEasy from SVN to Mercurial on Google Code I was a bit too eager (I'm funny like that). What I did was just checking the latest version out of SVN and then commiting that checkout as the first revision of the new Mercurial repo. This obviously has the effect that all history is lost. Later when ...