Re: XEmacs Packages have been pre-released (2013-09-02-17)
Norbert Koch <viteno(a)xemacs.org> writes:
I'm too stupid. I'm able to do the diff between the two
revisions, but
how to merge?
Here's the log output:
changeset: 1005:0c5a1e2bb50f
tag: tip
parent: 1003:b870d5948d75
parent: 1004:e361c37e5f87
user: Norbert Koch <viteno(a)xemacs.org>
date: Thu Sep 05 09:19:14 2013 +0200
summary: pending operations
changeset: 1004:e361c37e5f87
parent: 1000:9b7a21e38bc7
user: Jerry James <loganjerry(a)gmail.com>
date: Thu Aug 22 15:59:30 2013 -0600
summary: Add the functions number-sequence, string-or-null-p, and
booleanp to
So these are the only heads? Do something like this:
hg update 1005
hg merge 1004
or vice versa (i.e. swap 1005/1004). If they're the only two heads, you
can usually omit the argument to "hg merge".
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta