Re: CC Mode 5.30.10???? [Re: XEmacs Packages have been pre-released (2012-01-10-15)]
Mike Kupfer writes:
I'm not sure it's worth trying to figure out how we got here,
unless it
keeps happening. I agree with Mike S. that you'll want to merge the two
heads. After that, I would write off 1.46 and 1.47 as failed
experiments and generate a 1.48 package. Since it'll be done after
merging the heads, it should contain Alan's recent changes.
I think Mike K is right.
And Alan, I would suggest that *before* you merge these changesets
into your own Mercurial workspace, you should clone a new branch
directly from the official XEmacs repo, and then diff that against
your reference workspace. If that is not a Mercurial workspace, diff -ur
will be a little more noisy than hg diff, but still I bet the peace of
mind will be worth scanning it with some care for inadvertant divergence.
I apologize in advance for the trouble and any divergences that might
appear.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta