Re: Mercurial "r####" numbers are not stable, use commit ids
15 years, 11 months
Stephen J. Turnbull
Stephen J. Turnbull
Michael Sperber writes:
> I still don't understand what your problem is.
Mercurial makes it somewhat hard to do what I want to do (work in
branches), makes it easy to make mistakes in that mode, and makes it
hard to produce high S/N log listings and diffs.
> (You seem to prefer git, but it has essentially the same underlying
> model as Mercurial, AFAICS.)
Sure, and Scheme and Emacs Lisp share an underlying model, too. As
usual the devil's in the details. For example, I think that exposing
unstable revnos to the world is bad UI. The no-argument merge command
is bad UI (at least if both heads are on named branches). The fact
that a branch is not treated as a head if it's a proper ancestor of a
head is unintuitive to me, although I'm not prepared to categorize it
as "bad" yet. The fact that tags are commits is ugly. The fact that
a branch has no existence until you commit to it worries me. I can't
think of a "real" use for it, but when writing the script that I
posted for Mats I realized that an empty branch is useful for
simulating concurrency in a single-user context. So there might be
some odd case where it would be really nice to have such a thing.
> > I did merge locally (if you thought about it, you'd realize that,
> > because Mercurial won't push if it creates a head), but unfortunately
> > there were only two heads so "hg merge" just worked and then push did
> > the wrong thing by creating a branch (in almost five years of working
> > with distributed VCSes I've only *wanted* push to create a new remote
> > branch once). Worse yet, it was totally silent about it.
>
> Normally Mercurial refuses to create remote branches unless the -f
> option is specified. Could you be more specific about what you did?
What is written above is what I can remember or deduce about what I
did. All I can add is that the "bytecomp" branch was transplanted to
the end of the "g++-warnings" branch, that in my repo the most recent
commit to "default" was a proper ancestor (merge parent) of the
"bytecomp" head at the time of the push, and that I would NEVER EVER
specify -f to a push to the "xemacs" repository.
Are you sure that "hg push" knows anything about branches? AIUI in
Mercurial "branch" is an attribute of a commit, and single-valued, it
seems (unlike git, where a branch is implemented as an automatically
updated ref, all branches implicitly go back to a root, and a commit
can be on several branches simultaneously). ISTM that hg push has no
need-to-know about "branch", and that the restriction is against
creating new heads. A branch just goes along for the ride, because a
non-trivial branch will have a head.
So my guess is that because tip happened to be on bytecomp when I
pushed, and it was the only head (default didn't have one), hg push
happily pushed it to the xemacs repo, and reset tip of that repo to be
on my branch (possibly because default was inactive).
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 4 participants
- 3 comments
Hang in 'make check'
15 years, 11 months
Vin Shelton
Vin Shelton
Aidan,
In a mule build from the latest hg sources (see Installation file
below), query-coding-tests.el is hanging. Here's the tail of my 'make
check' output:
SUMMARY for /opt/src/xemacs-21.5-2008-12-30-mule/tests/automated/os-tests.el:
20 passes
0 assertion failures
0 errors that should have been generated, but weren't
0 wrong-error failures
0 missing-message failures
0 other failures
Testing /opt/src/xemacs-21.5-2008-12-30-mule/tests/automated/query-coding-tests.el...make[1]: *** [check] Interrupt
make: *** [check] Interrupt
Interestingly, when I run the test interactively, the tests all pass:
SUMMARY for /opt/build/xemacs-21.5-2008-12-30-mule/tests/automated/query-coding-tests.el:
1352 passes
0 assertion failures
0 errors that should have been generated, but weren't
0 wrong-error failures
0 missing-message failures
0 other failures
Here is the Installation file:
uname -a: Linux samwise 2.6.24-22-generic #1 SMP Mon Nov 24 18:32:42 UTC 2008 i686 GNU/Linux
../../src/xemacs-21.5-2008-12-30-mule/configure '--prefix=/opt/xemacs-21.5-2008-12-30-mule' '--with-cflags= -Os -ip' '--with-site-prefixes=/opt' '--with-infopath=/opt/info' '--disable-dialogs' '--disable-widgets' '--with-sound=native' '--with-package-path=/opt/site-packages::/opt/xemacs-packages' '--disable-pdump' '--enable-bignum=gmp' '--with-default-eol-detection' '--enable-mule' '--without-xim' 'CC=icc'
XEmacs 21.5-b28 "fuki" configured for `i686-pc-linux'.
Compilation Environment and Installation Defaults:
Source code location: /opt/src/xemacs-21.5-2008-12-30-mule
Installation prefix: /opt/xemacs-21.5-2008-12-30-mule
Additional prefixes: /opt
Operating system description file: `s/linux.h'
Machine description file: `m/intel386.h'
Compiler version: Intel(R) C Compiler for applications running on IA-32, Version 10.0 Build 20070809 Package ID: l_cc_c_10.0.026
- Compiler command: icc -Wall -w1 -we147 -g -Os -ip
libc version: GNU libc 2.7-10ubuntu4 (Debian)
Relocating allocator for buffers: no
GNU version of malloc: yes
- Using Doug Lea's new malloc from the GNU C Library.
Linking with `-z nocombreloc'.
- Consider configuring with --enable-pdump.
Window System:
Compiling in support for the X window system:
- X Windows headers location:
- X Windows libraries location:
- Handling WM_COMMAND properly.
Using Lucid menubars.
Using Lucid scrollbars.
TTY:
Compiling in support for ncurses.
Images:
Compiling in support for GIF images (builtin).
Compiling in support for XPM images.
Compiling in support for PNG images.
Compiling in support for JPEG images.
Compiling in support for TIFF images.
Sound:
Compiling in support for sound (native).
Databases:
Internationalization:
Compiling in support for Mule (multi-lingual Emacs).
Mail:
Compiling in support for "file" mail spool file locking method.
Other Features:
Inhibiting IPv6 canonicalization at startup.
Compiling in support for dynamic shared object modules.
Compiling in support for more number types using the GNU MP library.
Using the new GC mark algorithms (KKCC).
WARNING: ---------------------------------------------------------
WARNING: The new algorithms are experimental. They are enabled by
WARNING: default for this release. Use `--disable-kkcc' to
WARNING: turn it off.
WARNING: ---------------------------------------------------------
Compiling in support for extra debugging code.
Compiling in support for runtime error checking.
WARNING: ---------------------------------------------------------
WARNING: XEmacs will run noticeably more slowly as a result.
WARNING: Error checking is on by default for XEmacs beta releases.
WARNING: ---------------------------------------------------------
Let me know what help you need in reproducing this.
Thanks,
Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 2 participants
- 2 comments
XEmacs 21.4.22 tagged in CVS
15 years, 11 months
Vin Shelton
Vin Shelton
XEmacs 21.4.22 has been tagged in CVS and the tarballs are at
http://ftp.xemacs.org/xemacs-21.4/ .
I don't have access to the web pages right now, so I won't be able to
make a formal announcement until sometime this weekend.
Regards,
Vin
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 2 participants
- 1 comments
[Bug: 21.5-b28] Found cause of --with-union-type error
15 years, 11 months
robert delius royar
robert delius royar
The error appears to be caused by a bug in the way autoconf deals with
WORDS_BIGENDIAN when configure runs on a G5.
The resulting src/config.h from autoconf 2.63 places
/* #undef WORDS_BIGENDIAN */
in src/config.h whereas 2.62- and 2.61-created configurse add
#define WORDS_BIGENDIAN 1
to src/config.h
When a 2.62 (or 2.61) created configure runs, it says
checking whether byte ordering is bigendian... yes
but 2.63 script says
checking whether byte ordering is bigendian... universal
I have no idea whether those are different answers, but they seem to be.
This appears to cause a conflict when --with-union-type is defined from
configure. I recreated configure with autoconf (version 2.61 and 2.62)
and found that WORDS_BIGENDIAN was defined, and the resulting make
worked even with unions used for Lisp_Object.
Could this point to the potential for even more subtle bugs
Here is the configuration that works fine when autoconf 2.62 is used:
./configure '--with-mule' '--with-widgets=athena' '--with-athena=next'
'--with-dialogs=athena' '--with-scrollbars=lucid' '--without-debug'
'--without-error-checking' '--with-x11'
'--prefix=/Users/royar/usr/local' '--with-png' '--with-jpeg'
'--with-tiff' '--with-xmu' '--with-xim=no' '--enable-sound=none,esd'
'--disable-xfs' '--enable-dump-in-exec' '--with-modules'
'--enable-external-widget' '--with-dynamic' '--disable-kkcc'
'--disable-mc-alloc' '--without-ipv6-cname' '--without-ldap'
'--enable-optimization' '--with-cflags-optimization=-Os -pipe -mcpu=970
-mtune=970 -mpim-altivec -arch ppc' '--with-xft=emacs,gauges,tabs'
'--with-compiler=gcc-4.2' '--with-bignum=gmp' '--with-union-type'
'CC=/usr/bin/gcc-4.2' 'CFLAGS=' 'LDFLAGS=-L/usr/lib -lncurses -lgmp
-lz -L/usr/X11/lib -lpng -lXpm -lXft -lXrender -lXmu -lXt -lXext
-lX11 -lSM -lICE -lneXtaw -lfontconfig -L/opt/local/lib -ltiff -ljpeg
-lesd'
--
Dr. Robert Delius Royar Associate Professor of English
Morehead State University Morehead, Kentucky
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 2 participants
- 2 comments
XEmacs Packages have been pre-released (2009-01-01-14)
15 years, 11 months
Norbert Koch
Norbert Koch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hey there everyone.
I have just added the following packages to the 'Pre-Releases'
directory:
New Packages in Pre-Release:
===========================
leim-1.28-pkg.tar.gz upstream version: none
Previously Announced Packages Still in Pre-Release:
==================================================
apel-1.33-pkg.tar.gz upstream version: 10.6
auctex-1.51-pkg.tar.gz upstream version: 11.84
calendar-1.38-pkg.tar.gz upstream version: none
cedet-common-1.01-pkg.tar.gz upstream version: 1.0pre4
dired-1.19-pkg.tar.gz upstream version: 7.16
easypg-1.02-pkg.tar.gz upstream version: 0.0.16
ediff-1.77-pkg.tar.gz upstream version: 2.75
edit-utils-2.40-pkg.tar.gz upstream version: none
edt-1.14-pkg.tar.gz upstream version: none
efs-1.34-pkg.tar.gz upstream version: 1.24
eieio-1.06-pkg.tar.gz upstream version: 1.0pre4
elib-1.13-pkg.tar.gz upstream version: 1.0
erc-0.22-pkg.tar.gz upstream version: Version 5.1.2 Revision: 1.796.2.6
eshell-1.16-pkg.tar.gz upstream version: 0fc80a3f6bb3bb59f42e9ff83cc8b89bf90fe658
eudc-1.40-pkg.tar.gz upstream version: 1.32
fsf-compat-1.17-pkg.tar.gz upstream version: none
games-1.18-pkg.tar.gz upstream version: 1.04
general-docs-1.05-pkg.tar.gz upstream version: none
gnus-1.93-pkg.tar.gz upstream version: 5.10.8
guided-tour-0.52-pkg.tar.gz upstream version: none
hm--html-menus-1.24-pkg.tar.gz upstream version: 5.9
hyperbole-1.17-pkg.tar.gz upstream version: 5.0
igrep-1.16-pkg.tar.gz upstream version: 2.111
latin-euro-standards-1.08-pkg.ta upstream version: 1.08
locale-1.28-pkg.tar.gz upstream version: none
mail-lib-1.80-pkg.tar.gz upstream version: none
mh-e-1.31-pkg.tar.gz upstream version: 7.4.2
misc-games-1.21-pkg.tar.gz upstream version: none
mmm-mode-1.03-pkg.tar.gz upstream version: 0.4.8
mule-base-1.53-pkg.tar.gz upstream version: none
mule-ucs-1.17-pkg.tar.gz upstream version: 0.84
net-utils-1.56-pkg.tar.gz upstream version: N/A
oo-browser-1.05-pkg.tar.gz upstream version: 4.08
os-utils-1.41-pkg.tar.gz upstream version: none
pcl-cvs-1.68-pkg.tar.gz upstream version: R-2_9_9
pcomplete-1.05-pkg.tar.gz upstream version: 1.1.6
perl-modes-1.14-pkg.tar.gz upstream version: none
prog-modes-2.18-pkg.tar.gz upstream version: none
ps-print-1.12-pkg.tar.gz upstream version: 6.5.6
psgml-1.45-pkg.tar.gz upstream version: 1.3.2
python-modes-1.12-pkg.tar.gz upstream version: 5.0.0
scheme-1.17-pkg.tar.gz upstream version: none
sh-script-1.24-pkg.tar.gz upstream version: 2.0f
skk-1.24-pkg.tar.gz upstream version: 10.62a
slider-1.16-pkg.tar.gz upstream version: 0.3x1
speedbar-1.29-pkg.tar.gz upstream version: 1.0pre4
text-modes-1.95-pkg.tar.gz upstream version: none
tm-1.39-pkg.tar.gz upstream version: none
tramp-1.40-pkg.tar.gz upstream version: 2.0.56
vc-1.45-pkg.tar.gz upstream version: none
viper-1.65-pkg.tar.gz upstream version: 3.09
vm-8.07-pkg.tar.gz upstream version: 8.0.12-devo
w3-1.35-pkg.tar.gz upstream version: 4.0pre47
x-symbol-1.11-pkg.tar.gz upstream version: 4.5.1
xemacs-base-2.18-pkg.tar.gz upstream version: none
xemacs-devel-1.79-pkg.tar.gz upstream version: none
xetla-1.02-pkg.tar.gz upstream version: steve(a)eicq.org--2005/xetla--main--1.1--version-0
Detailed Changes:
================
- ------- ChangeLog Entries from mule-packages/leim/ChangeLog -------
2009-01-01 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.28 released.
2008-12-31 Aidan Kehoe <kehoea(a)parhasard.net>
* quail/ipa-21.5.el ("kirshenbaum-ipa"):
Correct the mapping for P, it should be to U+0278, as it is in the
X-SAMPA map.
* quail/ipa-21.5.el (x-sampa-prepend-to-keymap-entry):
Correct the syntax of a lambda's quote, use #' instead of '.
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.
norbert - XEmacs Package Release Manager.
Footnotes:
[1] Note: Mule packages should be installed into:
/usr/local/lib/xemacs/mule-packages/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iD8DBQFJXMOHgu3ywdHdhM0RAg3jAJ0bJzdlo2KtowmrLmGMN3SZFewz2ACgrWCR
he6Pq14rHqKcCoBDqfwRh60=
=hzQN
-----END PGP SIGNATURE-----
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 1 participants
- 0 comments
Re: xemacs.org/People
15 years, 11 months
Aidan Kehoe
Aidan Kehoe
Ar an chéad lá de mí Eanair, scríobh Stephen J. Turnbull:
> Would you mind trying again just for confirmation that I (finally) got
> it right?
Yup, I appear to have access to ChangeLog now too. Thanks!
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 1 participants
- 0 comments
Re: xemacs.org/People
15 years, 11 months
Aidan Kehoe
Aidan Kehoe
Ar an t-aonú lá is triochad de mí na Nollaig, scríobh Stephen J. Turnbull:
> Aidan Kehoe writes:
> >
> > Could someone remove the words ~lives in Berlin and~ from
> > xemacsweb/People/aidan.kehoe/index.content? Ta.
>
> Done, but can't you check it out and do it yourself? (Not that I
> mind -- I'd just refuse ;), just checking you have appropriate
> permissions.)
You made that change to People/ChangeLog, but not to
People/aidan.kehoe/index.content . I just tried to modify both, but the
former failed and the latter succeeded. So the initial problem of updating
my bio information appears resolved, but I don’t think the access list is
necessarily sane right now.
--
¿Dónde estará ahora mi sobrino Yoghurtu Nghé, que tuvo que huir
precipitadamente de la aldea por culpa de la escasez de rinocerontes?
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
- 1 participants
- 0 comments