Mercurial says "abort: outstanding uncommitted changes", I don't want to commit

mercurial push commit
Emanuel Landeholm picture Emanuel Landeholm · Jan 14, 2011 · Viewed 30.9k times · Source

Scenario: Local repo, before I leave the office

$ hg status

M important/update1
M another/important/update2
M work/in/progress

I want to commit and push important/update1 and important/update2, because I want to pull these files to my local repo when I get home. I'm not ready to commit work/in/progress. In fact it does not even parse correctly. That file is opened in my IDE and I just want to leave it as it is.

Now I do: (hurriedly, the tram leaves in three minutes)

$ hg commit important/update1 another/important/update2
$ hg push

pushing to https://**censored**
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)

Ok. Colleague has pushed something... (tram leaves in two minutes...)

$ hg pull (really important update!)
$ hg update

abort: outstanding uncommitted changes

Crap. I need colleagues' update but I'm not going to commit work/in/progress, much less push it! And I just missed my tram...

How do you deal with this?

Answer

minaz picture minaz · May 1, 2012

If you don't want to use shelve, you can do it with just 3 commands:

hg diff > mylocalchanges.txt

hg revert -a

# Do your merge here, once you are done, import back your local mods

hg import --no-commit mylocalchanges.txt

Related questions

How to only push to one branch in Hg?

I have a Hg repo with 3 branches in it, but two of them are inactive (since I have already merged them into my default branch). hg heads shows 3 heads, one for each branch, even though hg branches shows 2 of those …

Read More
What's the easiest way to commit and push a single file while leaving other modifications alone?

I'm relatively new to Mercurial and my team is trying it out right now as a replacement for Subversion. How can I commit and push a single file out to another repository while leaving other modifications in my working directory …

Read More
With Mercurial, how can I "compress" a series of changesets into one before pushing?

Let's say I have a local and a remote Mercurial repository. Now, I start working on a feature. I work on it, and when I think it's done, I commit the changeset. Testing it a bit more, I find that …

Read More