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

Posted by johnrock on Stack Overflow See other posts from Stack Overflow or by johnrock
Published on 2010-04-18T23:48:00Z Indexed on 2010/04/18 23:53 UTC
Read the original article Hit count: 338

Filed under:

mercurial

|

intellij-idea

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 Intellij. I can call hg update from the command line and that works fine.

Thanks

© Stack Overflow or respective owner

Related posts about mercurial

Mercurial fails while commiting/updating/etc. using Mercuriual+TrueCrypt+MAC

as seen on Stack Overflow - Search for 'Stack Overflow'
While trying to work with Mercurial on project located on TrueCrypt partition I always get en error as follows: ** unknown exception encountered, details follow ** report bug details to http://mercurial.selenic.com/bts/ ** or [email protected] ** Mercurial Distributed SCM (version 1.5.2+20100502) **… >>> More
OS X, Mercurial and MediaTemple problem

as seen on Stack Overflow - Search for 'Stack Overflow'
I've installed Mercurial per MT's knowledge base file here. Working with it server side using ssh from my Mac works fine. I can initialize repositories and the like, but pulling from the server or pushing from my Mac produces an error I don't understand. Here's what I get when call hg push from… >>> More
Mercurial to Mercurial to Subversion Workflow Problem

as seen on Stack Overflow - Search for 'Stack Overflow'
We're migrating from Subversion to Mercurial. To facilitate the migration, we're creating an intermediate Mercurial repository that is a clone of our Subversion repository. All developers will be begin switching over to the Mercurial repository, and we'll periodically push changes from the intermediate… >>> More
How do I configure Mercurial to use environment variables in mercurial.ini

as seen on Stack Overflow - Search for 'Stack Overflow'
How can I modify the mercurial.ini file to include an environment variable such as %userprofile%. Specific situation: I am learning to use Mercurial. I have modified the [ui] section of Mercurial.ini (in my home path) to include: ignore = c:\users\user\.hgignore Where user is my username literal… >>> More
Mercurial: Problem converting Windows cvs repository to mercurial

as seen on Stack Overflow - Search for 'Stack Overflow'
I’m trying to convert an existing Windows CVS repository to Mercurial and getting the following response and error: C:\Windows\system32>hg convert c:\users\jeff\webs\shelter-cvs\shelter assuming destination shelter-hg initializing destination shelter-hg repository connecting to :local:c:\cvs abort:… >>> More

Related posts about intellij-idea

Need IntelliJ IDEA 9 cheat sheet

as seen on Stack Overflow - Search for 'Stack Overflow'
I searched but couldn't find anything what I can print and put on the wall. >>> More
Hidden Features IntelliJ IDEA

as seen on Stack Overflow - Search for 'Stack Overflow'
Just another Hidden features and tips and tricks WIKI. After seeing the hidden features of eclipse, java, spring framework I thought we need to have a list of the features, TIPS for IntelliJ too which is the best and the Intelligent IDE available for java. >>> More
Identify in a unit test if Jetbrains IntelliJ IDEA 8 or 9 is running

as seen on Stack Overflow - Search for 'Stack Overflow'
I need to know, in a context of a unit test, if Jetbrains IntelliJ idea is the test initiator and if it is, which version is running (or at least if it's "9" or earlier). I don't mind doing dirty tricks (reflection, filesystem, environment...) but I do need this to work "out-of-the-box" (without… >>> More
creating a Grails application in IntelliJ IDEA 9.0.x fails to prompt for "create-app"

as seen on Stack Overflow - Search for 'Stack Overflow'
When I create a Grails application in IntelliJ 9 on Snow Leopard I am not prompted to create an application. IntelliJ finished the wizard and creates an empty project that is not a Grails application. I have tried two different Apple computers (MacBook Pro and Mac Pro) it does not work on either… >>> More
How to give more memory to IntelliJ Idea 9

as seen on Stack Overflow - Search for 'Stack Overflow'
I am using IntelliJ IDEA 9. In the IDEA window On the bottom right corner I see the current memory usage, typically "224M of 254M" How do I give more memory to Idea so it may read like "224M of 512M" ? Thank you. >>> More