abort: outstanding uncommitted changes?
Neal Becker
ndbecker2 at gmail.com
Fri Sep 26 15:06:24 UTC 2008
Benoit Boissinot wrote:
> On Fri, Sep 26, 2008 at 4:36 PM, Peter Hosey <boredzo at gmail.com> wrote:
>> On Sep 26, 2008, at 07:24:08, Neal Becker wrote:
>>> hg merge
>>> abort: outstanding uncommitted changes
>>> hg diff
>>> hg status -m
>>>
>>> OK, how do I figure out what the "outstanding uncommitted changes"
>>> are??
>>
>> What does hg status say without -m?
>>
>> What does hg parents say?
>
> And which extensions are in use ?
>
> regards,
>
> Benoit
There are a bunch of files marked: ! (deleted, but still tracked).
You know what would be great? hg merge --explain.
Why doesn't hg diff --git show these files are deleted? I think it should show all these things, then people wouldn't have to keep asking these stupid questions :)
More information about the Mercurial
mailing list