8:34 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hey there everyone.
Sorry for the delay, I've been on vacation. If I've missed any package
commits, please let me know.
I have just added the following packages to the 'Pre-Releases'
directory:
New Packages in Pre-Release:
===========================
erc-0.24-pkg.tar.gz upstream version: Version 5.1.2 Revision:
1.796.2.6
leim-1.34-pkg.tar.gz upstream version: none
misc-games-1.23-pkg.tar.gz upstream version: none
xemacs-base-2.37-pkg.tar.gz upstream version: none
Previously Announced Packages Still in Pre-Release:
==================================================
Sun-1.17-pkg.tar.gz upstream version: none
cc-mode-1.69-pkg.tar.gz upstream version: 5.32.2
ede-1.04-pkg.tar.gz upstream version: 1.0pre4
ediff-1.82-pkg.tar.gz upstream version: 2.75
edit-utils-2.51-pkg.tar.gz upstream version: none
efs-1.35-pkg.tar.gz upstream version: 1.24
eudc-1.41-pkg.tar.gz upstream version: 1.32
games-1.21-pkg.tar.gz upstream version: 2.00
gnus-1.95-pkg.tar.gz upstream version: 5.10.10
hyperbole-1.19-pkg.tar.gz upstream version: 5.0.3
mh-e-1.33-pkg.tar.gz upstream version: 7.4.2
mmm-mode-1.06-pkg.tar.gz upstream version: 0.4.8
net-utils-1.57-pkg.tar.gz upstream version: N/A
pcl-cvs-1.71-pkg.tar.gz upstream version: R-2_9_9
pgg-1.08-pkg.tar.gz upstream version: 0.1
prog-modes-2.29-pkg.tar.gz upstream version: none
ruby-modes-1.05-pkg.tar.gz upstream version: 1.8.7
speedbar-1.30-pkg.tar.gz upstream version: 1.0pre4
text-modes-2.01-pkg.tar.gz upstream version: none
tramp-1.45-pkg.tar.gz upstream version: 2.2.7
w3-1.38-pkg.tar.gz upstream version: 4.0pre47
x-symbol-1.13-pkg.tar.gz upstream version: 4.5.1
xemacs-devel-1.82-pkg.tar.gz upstream version: none
Detailed Changes:
================
- ------- ChangeLog Entries from mule-packages/leim/ChangeLog -------
2013-09-02 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.34 released.
2013-08-03 Aidan Kehoe <kehoea(a)parhasard.net>
* quail.el (quail-define-rules):
Check for duplicate rules, warn about same.
GNU silently merges such rules, but XEmacs doesn't, and this is
saner behaviour, it's easier to miss identical rules textually far
away when reading the code.
* quail.el (quail-install-map):
Backslash a parenthesis for the sake of fontification.
* quail/latin-post.el:
Merge duplicates explicitly in latin-1-postfix, spanish-postfix,
turkish-latin-3-postfix, turkish-postfix, and latin-postfix.
Rewrite the code generation for latin-postfix to do more at
compile time, and to check for duplicates and warn.
- ------- ChangeLog Entries from xemacs-packages/misc-games/ChangeLog -------
2013-09-02 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.23 released.
2013-08-17 Stephen J. Turnbull <stephen(a)xemacs.org>
* doctor.el: Grind and adjust whitespace to modern conventions.
The previous patch made many lines substantially longer.
2013-08-17 Stephen J. Turnbull <stephen(a)xemacs.org>
* doctor.el (//): Rename to #'identity and defun if not fboundp.
($): Rename to #'doctor-$.
(doctor-$): rename to #'doctor-$-internal.
- ------- ChangeLog Entries from xemacs-packages/xemacs-base/ChangeLog -------
2013-09-02 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 2.37 released.
2013-06-26 Jerry James <james(a)xemacs.org>
* subr-more.el (number-sequence, string-or-null-p, booleanp):
Add, used by tramp and newer versions of CEDET.
Installing These:
================
Manually:
- --------
1) Download the packages that you want to install from:
/ftp.xemacs.org:/pub/xemacs/beta/experimental/packages/
2) Unpack them to: [1]
/usr/local/lib/xemacs/xemacs-packages/
3) Re-start XEmacs.
Using XEmacs Package Tools (XEmacs 21.[245].x):
- ----------------------------------------------
1) Tools -> Packages -> Add Download Site -> Pre-Releases
2) Tools -> Packages -> List and Install
3) Select the packages you wish to install (there are brief
instructions at the bottom of the packages buffer).
4) Packages -> Install/Remove Selected
5) Re-start XEmacs.
Using XEmacs Package Tools (XEmacs 21.1.14):
- -------------------------------------------
1) Options -> Manage Packages -> Add Download Site -> Pre-Releases
2) Options -> Manage Packages -> List and Install
3 - 5) As per XEmacs 21.[245].x.
Footnotes:
[1] Note: Mule packages should be installed into:
/usr/local/lib/xemacs/mule-packages/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFSJZE87yJLt8ORD7cRAks8AJ9QpMRwewsFIy2GvSZQK+yoZoOsiQCcDPVp
1TRlxcerItoqgZ1l5KzWLpg=
=Ka/b
-----END PGP SIGNATURE-----
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9 p.m.
>>>> Norbert Koch <viteno(a)xemacs.org> writes:
misc-games-1.23-pkg.tar.gz upstream version: none
The package is not updated (yet!?) on http://ftp.xemacs.org/pub/xemacs/packages/
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:12 p.m.
* Mats Lidell <matsl(a)xemacs.org>:
Hello Mats,
The package is not updated (yet!?) on
http://ftp.xemacs.org/pub/xemacs/packages/
Unfortunately, yes. I run into the problem Steve has been talking
about. Question from me now is (sorry, I haven't posed it yet): Is it
possible for me to pull and merge in the package root or does this break
things? Right now I get the message
abort: push creates new remote head b870d5948d75!
(did you forget to merge? use push -f to force)
Thanks for any hints,
norbert.
--
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
2:46 a.m.
＠Jerry:
You don't need to commit or push to the xemacs-packages repo. Norbert
does that as part of the Pre-Release process. And you probably
shouldn't, it confuses Norbert, or at least his scripts. :-) hg view
on the xemacs-packages repo will give you the picture.
Norbert Koch writes:
I run into the problem Steve has been talking about.
Not really. I was confusing myself. You're just seeing concurrent
development happening, this is what *should* happen in that case. Our
"packages" workflow is designed to avoid concurrent commits (two
commits with the same parent) to make life simple for you. Jerry
didn't follow it, that's all.
Question from me now is (sorry, I haven't posed it yet): Is it
possible for me to pull and merge in the package root or does this
break things? Right now I get the message
abort: push creates new remote head b870d5948d75!
(did you forget to merge? use push -f to force)
You don't want to use "push -f", that's for sure.
It's always possible to pull and merge. The great thing about
DAG-based VCSes is that if you avoid commands like 'strip' you can
always rewind to any state you've visited before, so pull and (trying
to) merge is always safe, in the sense that you can checkout either of
the commits you're trying to merge, and work from there by hand to get
to somewhere sane. What you lose is time (and maybe some pulled-out
hair:-) trying to make the hg-merge commitable.
Looking at the state of the "xemacs-packages" repo on bitbucket, it
seems to me that all that happened is that Jerry updated the
xemacs-packages repo for you. This *would* create a new head that you
have to merge.
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.
If it doesn't, the conflict will be in .hgsubstate at xemacs-base.
Choose your line there. Jerry's will have a hash starting with
dbe31f6c32..., yours is the other one. Then do "hg resolve --mark
.hgsubstate", commit, and push.
Before pushing you might want to redo hg view and make sure everything
looks sane.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3:55 a.m.
On Wed, Sep 4, 2013 at 7:46 PM, Stephen J. Turnbull <stephen(a)xemacs.org> wrote:
＠Jerry:
You don't need to commit or push to the xemacs-packages repo. Norbert
does that as part of the Pre-Release process. And you probably
shouldn't, it confuses Norbert, or at least his scripts. :-) hg view
on the xemacs-packages repo will give you the picture.
Oops. Shall I sing the "I'm Very Sorry" song?
I think I got confused because I did a push in the subrepo on one
machine, then later when I did an "hg pull" on another machine, it
didn't find my changes. So I leapt to the erroneous conclusion that
that meant that Something Wasn't Right and I needed to try again at
the top level to make it all right.
What's the process for creating a new subrepo, then, if we decide to
add a package?
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
6:22 a.m.
Jerry James writes:
Oops. Shall I sing the "I'm Very Sorry" song?
Oh, I don't think you need to do that.
I think I got confused because I did a push in the subrepo on one
machine, then later when I did an "hg pull" on another machine, it
didn't find my changes.
Did you do the "hg pull" at top level, or in the subrepo, on the
second host? If the latter, AFAIK you *should* get the changes even
though the top-level pull shows no changes. At least, I got them.
That's correct behavior by design, but confusing from our point of
view. Subrepos are designed for the case where you *don't* have any
control over upstream, and need to *pin* the version of that repo to
protect yourself from upstream churn. I don't know what to say except
"Patience, Grasshopper. Norbert will get to it." I think this is
best for beta testers, as well as simpler for Norbert.
Note that if you want to be notified of changes in the subrepos, you
can subscribe to the RSS feed for the xemacs project, or for a
specific repo.
What's the process for creating a new subrepo, then, if we decide
to
add a package?
Mike probably knows better, but AFAIK:
Just push to hg://hg＠hg.xemacs.prg/xemacs-packages/foo, and tell
Norbert. He adds xemacs-packages/foo to the xemacs-packages/.hgsub,
hg updates, and commits.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
7:51 a.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Just push to hg://hg＠hg.xemacs.prg/xemacs-packages/foo, and tell
Norbert. He adds xemacs-packages/foo to the xemacs-packages/.hgsub,
hg updates, and commits.
First, somebody need to create a new repo on Bitbucket. If you can send
me a name, I'd be happy to do it. (And Stephen's right: Somebody then
needs to check it out in the packages tree, and add it to .hgsub.)
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
8:32 a.m.
* "Stephen J. Turnbull" <stephen(a)xemacs.org>:
Hi!
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.
Hmm, problem is, hg view fails with the shell telling me it can't find
hgk. What's that for?
Thanks for any pointers,
norbert.
--
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:10 a.m.
Norbert Koch writes:
Hmm, problem is, hg view fails with the shell telling me it can't
find
hgk. What's that for?
Sorry, I assumed hgk was distributed with Mercurial now. hgk is a
port (more or less) of gitk to Mercurial. 'hg view' is a convenient
ui to it. I think it's more-or-less like 'gitk --all'. But hgk
supports fewer features than modern gitk. You could try 'locate hgk'
or see if your distro has a separate hgk package.
You can also use hg log, but I've been used to the graphical view of
hgk for so long I have forgotten all the tricks to doing it
efficiently.
Steve
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3:43 p.m.
"Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
Norbert Koch writes:
> Hmm, problem is, hg view fails with the shell telling me it can't find
> hgk. What's that for?
Sorry, I assumed hgk was distributed with Mercurial now. hgk is a
port (more or less) of gitk to Mercurial. 'hg view' is a convenient
ui to it. I think it's more-or-less like 'gitk --all'. But hgk
supports fewer features than modern gitk. You could try 'locate hgk'
or see if your distro has a separate hgk package.
You can also use hg log, but I've been used to the graphical view of
hgk for so long I have forgotten all the tricks to doing it
efficiently.
It usually sits in Mercurial's contrib directory, where it can be copied
to the path. Requires Tcl/Tk.
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:44 p.m.
* "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
8:09 a.m.
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
10:37 a.m.
* Michael Sperber <sperber(a)deinprogramm.de>:
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".
That doesn't work (direct ancestry). I can update to 1003
and merge 1004, though:
hg update 1003
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg merge 1004
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Would that do any good?
Thanks,
norbert.
--
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
2:58 p.m.
Norbert Koch <viteno(a)xemacs.org> writes:
* Michael Sperber <sperber(a)deinprogramm.de>:
> 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".
That doesn't work (direct ancestry).
Ah, my bad, didn't see that.
I can update to 1003 and merge 1004, though:
hg update 1003
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg merge 1004
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Would that do any good?
No, because that's already done by 1005. What does "hg heads" say? It
now looks as though everything that could be merged has been merged.
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3:07 p.m.
* Michael Sperber <sperber(a)deinprogramm.de>:
No, because that's already done by 1005. What does "hg
heads" say? It
now looks as though everything that could be merged has been merged.
:-) mercurial does not stop confusing me ...
On the newest revision it looks like
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
Below is the log output for the last 6 revisions which contains the
parents.
norbert.
--
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
changeset: 1002:6c828f1cd893
user: Norbert Koch <viteno(a)xemacs.org>
date: Mon Sep 02 14:45:58 2013 +0200
summary: XEmacs Package Release
changeset: 1001:42facd1d7711
user: Norbert Koch <viteno(a)xemacs.org>
date: Mon Sep 02 14:44:23 2013 +0200
summary: update packages erc leim misc-games xemacs-base
changeset: 1000:9b7a21e38bc7
user: Norbert Koch <viteno(a)xemacs.org>
date: Mon Jun 24 08:54:39 2013 +0200
summary: Pre-release efs 1.35
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3:39 p.m.
Norbert Koch <viteno(a)xemacs.org> writes:
* Michael Sperber <sperber(a)deinprogramm.de>:
> No, because that's already done by 1005. What does "hg heads" say?
It
> now looks as though everything that could be merged has been merged.
:-) mercurial does not stop confusing me ...
You keep not telling me the output of "hg heads".
On the newest revision it looks like
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
This is a merge, and I see no other open heads. So it appears that
everything is fine.
--
Regards,
Mike
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
9:23 a.m.
* Michael Sperber <sperber(a)deinprogramm.de>:
Hi!
You keep not telling me the output of "hg heads".
Because the output is the same as below.
> On the newest revision it looks like
>
> 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
This is a merge, and I see no other open heads. So it appears that
everything is fine.
Now, this is strange. The hg push has just successfully finished. And
I don't have the slightest clue what action has made the difference :/
So, scratch that episode,
norbert.
--
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
10:36 a.m.
Norbert Koch writes:
Now, this is strange. The hg push has just successfully finished.
And I don't have the slightest clue what action has made the
difference :/
Lord Voldemort was at lunch, no doubt. Good work, Harry Potter!
-- Albus Dumbledore
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
4090
days inactive
4098
days old
17 comments
5 participants
participants (5)
-
Jerry James -
Michael Sperber -
Norbert Koch -
Stephen J. Turnbull -
The XEmacs Package Smoketest