hg merge says "outstanding uncommitted changes"

[Mahmood Naderan]

Again I ran hg commit (I didn't revert)

mahmood at ju:prj$ hg commit -m "test1"
mahmood at ju:prj$

Then I ran hg pull again:

mahmood at ju:prj$ hg pull
....
searching for changes
no changes found
mahmood at ju:prj$

 

Since I pulled in the first post, there is no changeset
Again, hg heads hows two heads (test1 which is the latest and the other is the latest from website)

mahmood at ju:prj$ hg heads
changeset:   8850:00b85f5e546a
...
summary:     test1

changeset:   8849:2629f0b99e8d
....


Now I rerun "hg merge", 

mahmood at ju:prj$ hg merge
abort: outstanding uncommitted changes (use 'hg status' to list changes)

I don't understand why it says that. "hg commit" has no problem.



// Naderan *Mahmood;


----- Original Message -----
From: Isaac Jurado <diptongo at gmail.com>
To: Mahmood Naderan <nt_mahmood at yahoo.com>
Cc: "mercurial at selenic.com" <mercurial at selenic.com>
Sent: Wednesday, February 22, 2012 4:35 PM
Subject: Re: hg merge says "outstanding uncommitted changes"

On Wed, Feb 22, 2012 at 1:53 PM, Mahmood Naderan <nt_mahmood at yahoo.com> wrote:
>
> Now when I run "hg merge" it says:
> abort: outstanding uncommitted changes (use 'hg status' to list changes)
>
> What does that mean? hadn't I commit my changes?

Apparently no.

> "hg status" lists some files.

If you want to save your changes: "hg commit".  If you want to discard:
"hg revert -a" or "hg up -C ."

Cheers.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci