Need help for a hg push

[Norbert Koch]

* "Stephen J. Turnbull" <stephen at xemacs.org>:

Hi!

Thanks for the recipe (in the other message).  This sounds very good to
me.

> # won't really  hurt anything and doesn't require a fixup in Aidan's workspace
> hg update <your head>
> hg merge <Aidan's head>
> hg push

This is puzzling me :-/

% hg update --rev da9a831ac5eb
  ...
% hg merge --rev 7970bc3d910c
  abort: outstanding uncommitted changes in subrepository
  'xemacs-packages/cc-mode'

cc-mode% hg summary
  parent: 112:aecc1a179b8b tip
   XEmacs Package Release 1.46
  branch: default
  commit: 24 unknown (clean)
  update: (current)
cc-mode% hg status
  ? _pkg.el
  [...]
  ? package-info

So, what changes are we talking about?

*sigh* sorry,
norbert.
--