Norbert Koch writes:
This is puzzling me :-/
% hg update --rev da9a831ac5eb
I told you not to do that! :-) I *think* it should be OK in this
case, or maybe even The Right Thing To DO, but in a parent repo this
can have rather surprising effects on subrepos (it will revert them).
% hg merge --rev 7970bc3d910c
abort: outstanding uncommitted changes in subrepository
So, what changes are we talking about?
Either you changed state with the hg update, or you haven't yet
actually committed Alan's changes to the parent repo. Do the revision
ids given by "(cd xemacs-packages/cc-mode; hg id -i)" and "grep
cc-mode .hgsubstate" match? If yes, "pushd xemacs-packages/cc-mode;
hg update tip; popd" should probably get you where you want to be.
Then hg commit to update .hgsubstate to have the appropriate version
Of course throughout you should be doing hg status / hg diff -S to
make sure things look right.
XEmacs-Beta mailing list