Re: output from hg pull -u

[Bruno H. <br...@cl...>]

Don Cohen wrote:
> pulling from http://hg.code.sf.net/p/clisp/clisp
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 4 changes to 4 files
> abort: outstanding merge conflicts

Have you checked the various status commands?

  $ hg status
  $ hg summary --remote

  $ hg out

  $ hg in

  $ hg branches

  $ hg heads

hg doesn't display this status at every command, but you need to be aware
of this context.

Or maybe someone has pushed a commit, edited it, and pushed again. If you were
unlucky enough to pull the intermediate commit, you need to drop it first:

  $ hg strip REVISION-(N-1)
  See https://www.mercurial-scm.org/wiki/StripExtension

Bruno