Jonathan Harris <jhar(a)tardis.ed.ac.uk> writes in xemacs-beta(a)xemacs.org:
SL Baur wrote:
>
[snip]
> Just to be clear. You're referring to about.el (ie. etc/photos/*.png),
> right? The .pngs in the top-level etc/ directory don't appear to have
> -kb as a sticky option. If about.el doesn't work in 21.2, something
> else is wrong.
None of the .pngs under etc/ and etc/photos/ obtained by 'cvs
checkout
-r release-21-2 xemacs-20' are valid according to both XEmacs 21.0 and
another image viewer.
Are you seeing any sticky options at all?
$ cd ~xemacs/xemacs-21.2/etc/photos
$ cvs status -v slb.png
===================================================================
File: slb.png Status: Up-to-date
Working revision: 1.1.2.1 Fri Jul 31 19:48:28 1998
Repository revision: 1.1.2.1 /usr/local/xemacs/xemacs-20.0/etc/photos/slb.png,v
Sticky Tag: release-21-2 (branch: 1.1.2)
Sticky Date: (none)
Sticky Options: -kb
Existing Tags:
r21-0b56 (revision: 1.1)
r21-0b55 (revision: 1.1)
r21-0b54 (revision: 1.1)
r21-0b53 (revision: 1.1)
r21-0b52 (revision: 1.1)
release-21-2 (branch: 1.1.2)
...
('cvs checkout -r release-21-2 xemacs-20' is right, isn't
it? it gives
xemacs_codename as "Aether-pre5" in version.sh).
Yup.
I understand that the -kb flag is a global setting across different
revisions and tags of a file, so it applies equally for the files in
21.0 and 21.2.
It depends on whether files have a common ancestor or not. etc/photos/*.png
was introduced after the split, so they were checked into each branch in
separately. The 21.0 branch does not appear to have `-kb', but the 21.2
branch does. If the 21.2 branch isn't correct, something else is wrong.