Cannot update "outstanding uncommitted merges" but there are
none such merges
mpm at selenic.com
Fri Sep 16 12:17:08 CDT 2005
On Fri, Sep 16, 2005 at 07:17:07AM -0700, Bryan O'Sullivan wrote:
> On Fri, 2005-09-16 at 16:11 +0200, Stephane Bortzmeyer wrote:
> > I cannot update my working directory:
> > % hg update -m
> > aborting: outstanding uncommitted merges
> Use "hg heads" to see how many heads your repository has. Then switch
> heads using "hg update REV" or "hg update -C REV" and try the merge and
> commit again.
Bryan's confusing this with another warning.
The above message means you've already done an update -m and now your
working directory has two parents. A second update -m would cause you
to have three parents and that isn't allowed: you have to commit.
In this case, "hg parents" will list two parents.
Assuming you're using tip, commit should say something like:
HG: branch merge
HG: no files changed
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial