Re: XEmacs Packages have been pre-released (2013-09-02-17)
* "Stephen J. Turnbull" <stephen(a)xemacs.org>:
What to do: do 'hg pull' (no '-u') in your
xemacs-packages checkout.
Then do 'hg view &'. You should see a long list of commits and tags
by you, with a tiny fork at the top. There will be one or more
commits by you on one branch, and one by Jerry on the other.
Do a hg diff between your head and Jerry's. I expect that the only
difference will be your additions to .hgtags, and the difference in
.hgsubstate. If what you see doesn't make sense to you, feel free to
post the diff. If it does make sense, do the hg merge. It may "Just
Work". If so, you can commit, and push.
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
changeset: 1003:b870d5948d75
user: Norbert Koch <viteno(a)xemacs.org>
date: Tue Sep 03 09:28:22 2013 +0200
summary: pre-release packages erc leim misc-games xemacs-base
The diff between the top-most revisions is
diff -r e361c37e5f87 -r 0c5a1e2bb50f .hgsubstate
--- a/.hgsubstate Thu Aug 22 15:59:30 2013 -0600
+++ b/.hgsubstate Thu Sep 05 09:19:14 2013 +0200
＠＠ -2,7 +2,7 ＠＠
cc32bd2c9d095f74d611b2221f7d100565850acb mule-packages/egg-its
2b1bb95aa35bef5bb0c36c518ba1c2dd7bd3af02 mule-packages/latin-euro-standards
fd76220eb27f425aae390fcf774797e7216f2426 mule-packages/latin-unity
-a53c6d7f6ae2bfbf3c7f19ea8553501e2b30ec28 mule-packages/leim
+72865092f02b13aced9cd49b5fd2297d2b0a5b27 mule-packages/leim
5afa64cf5daef1c66e7fcca68a856fd886ae83ec mule-packages/locale
f8c79d7bcfb459350e88e82e3c76bf3620fe15c6 mule-packages/lookup
382d17988c34f608ce741003148890aeb06c20c5 mule-packages/mule-base
＠＠ -40,7 +40,7 ＠＠
c498c1621c7dff0e835215129b80c5b53eb4ef33 xemacs-packages/eieio
b4507a4857330d15869ce16cd74c1014aa9ecbcb xemacs-packages/elib
f8210eab162b9ea35f3dcce579960d7807ac1f74 xemacs-packages/emerge
-63205fffa0eca7e872cb62c176cda7d1e0d627f6 xemacs-packages/erc
+efba2c27bdf397b9cbfadbb442275559d69e19a6 xemacs-packages/erc
1e91ed73cc98217dfad93d14864d1fd8e8cbbe02 xemacs-packages/escreen
c1f33e202c13a6fe1a03bf84d55fc53819f80013 xemacs-packages/eshell
7be4c897940fd291183a3c9cf4cace91489d29cd xemacs-packages/ess
＠＠ -71,7 +71,7 ＠＠
94793e4b0b7e58e049ef93522a16ca8f7aa3632e xemacs-packages/mew
75ee31abcb26795cb9316dd53cdead6f9728e2ab xemacs-packages/mh-e
ccb3d74d9f75a12b77197f480da12f31e495a98d xemacs-packages/mine
-d656b7e454fbff76dc31e450bf0f94969ffab37c xemacs-packages/misc-games
+d87e94b356f7bb56cab2489ed45f5b8e1d879e23 xemacs-packages/misc-games
306282595cd6c40b1ac35d774319165413dbf8b4 xemacs-packages/mmm-mode
89c61585a9a799cc0cbeb69ab1e841732ffdc3eb xemacs-packages/net-utils
fd7ad264907107574dbbe5492304ec4a9786d658 xemacs-packages/ocaml
＠＠ -123,7 +123,7 ＠＠
4eb09b852b72373e7ce9790cb9ebafc7e1b7598e xemacs-packages/vm
d1d1893d29ed5c97fab849e1ffb3a51d778d8026 xemacs-packages/w3
fd7cd3bdb22b444b112299facd2375daa2091dee xemacs-packages/x-symbol
-dbe31f6c321815a3a77e3ee2b0a2e59514fc5d3c xemacs-packages/xemacs-base
+ca80885735351782c2994ad8eb92df52cec46470 xemacs-packages/xemacs-base
9c8d90ff018391ccc55abcf6967ea6a00e749f53 xemacs-packages/xemacs-devel
be5592eaca6a65548d138ecd753f2e71b123793a xemacs-packages/xetla
bc5e241f2ddfed169b3e679b85a030237d5132ee xemacs-packages/xlib
diff -r e361c37e5f87 -r 0c5a1e2bb50f ChangeLog
--- a/ChangeLog Thu Aug 22 15:59:30 2013 -0600
+++ b/ChangeLog Thu Sep 05 09:19:14 2013 +0200
＠＠ -1,3 +1,7 ＠＠
+2013-09-02 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: leim, erc, misc-games, xemacs-base.
+
2013-06-24 Norbert Koch <viteno(a)xemacs.org>
* Packages released: efs.
What revisions should I try to merge?
Thanks,
norbert.
--
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta