Re: Bug: png files at cvs.xemacs.org
SL Baur wrote:
[snip]
Are you seeing any sticky options at all?
Ermmm, I am now. I had "checkout -ko -P" and "update -Pd" in my
~/.cvsrc. I didn't realise that -ko would replace the -kb, but looking
at the docs again they make it reasonably clear that this is the case.
<Hangs head in shame>.
> 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.
After doing a "cvs update -A", I'm also now seeing -kb on the 21.0 tree
as well. Unless you've just applied the -kb flag to the files in the
21.0 tree, the -kb option really does appear to be global:
d:\xemacs\xemacs-20\etc\photos>cvs status -v slb.png
===================================================================
File: slb.png Status: Up-to-date
Working revision: 1.1
Repository revision: 1.1
/usr/CVSroot/XEmacs/xemacs-20/etc/photos/slb.png,v
Sticky Tag: (none)
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)
d:\xemacs\xemacs-20\etc>cvs status -v cbx.png
===================================================================
File: cbx.png Status: Up-to-date
Working revision: 1.1
Repository revision: 1.1
/usr/CVSroot/XEmacs/xemacs-20/etc/cbx.png,v
Sticky Tag: (none)
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)
r21-0b51 (revision: 1.1)
r21-0b50 (revision: 1.1)
r21-0b49 (revision: 1.1)
r21-2b1 (revision: 1.1)
release-22-0 (branch: 1.1.4)
release-21-2 (branch: 1.1.2)
r21-0b48 (revision: 1.1)
r21-0b47 (revision: 1.1)
r21-0b46 (revision: 1.1)
r21-0b45 (revision: 1.1)
r21-0b44 (revision: 1.1)
r21-0b43 (revision: 1.1)
r21-0b42 (revision: 1.1)
r21-0b41 (revision: 1.1)
r21-0b40 (revision: 1.1)
r21-0b39 (revision: 1.1)
r21-0b38 (revision: 1.1)
I'm very sorry to have wasted your time.
Jonathan.
--
Jonathan Harris | jhar(a)tardis.ed.ac.uk
London, England | Jonathan.Harris(a)symbian.com