Norbert Koch <viteno(a)xemacs.org> writes:
Uh ah, there may be (one of) the problem(s):
nk@vserv:cc-mode% hg heads
changeset: 123:3647259c12f1
tag: tip
user: Norbert Koch <viteno(a)xemacs.org>
date: Tue Jan 10 15:40:08 2012 +0100
summary: Added tag cc-mode-1_47 for changeset 1af191b522b5
changeset: 119:4e9db4db477f
user: Alan Mackenzie <acm(a)muc.de>
date: Sun Jan 08 12:37:09 2012 +0000
summary: Optimise font locking in long enum definitions.
Although this could be normal, since I haven't pushed my committed changes
(tagging plus Makefile and ChangeLog updates).
The complete package workspace has been cloned prior to my package
release, so I should be up to date (but for my changes).
I presume you want to merge. You do:
hg merge
and then (if that succeeds):
hg commit -m Merge.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta