bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Major change in conflict handling between 1.12.9 and 1.12.13?


From: Mark D. Baushke
Subject: Re: Major change in conflict handling between 1.12.9 and 1.12.13?
Date: Thu, 08 Jun 2006 18:01:02 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jim Hyslop <address@hidden> writes:

> [Note: restoring this discussion to bug-cvs list - Derek's patch is
> copied below my sig]
> 
> Derek R. Price wrote:
> >  I'd like to look into
> > this a little deeper because this change was supposed to fix another
> > issue.  I'm guessing that it was only the new client running against
> > an old server that exhibited the problem?  If so, then does the
> > attached patch fix this problem?
> 
> Applying the patch to 1.11.21, and using an old server, the patch
> resolves the issue. I can't test against a new server, though.
> 
> Given the serious nature of this bug, what do you think about releasing
> revs 1.11.22 and 1.12.14? 

I believe that 1.11.22 is STABLE and could easily be released with no
problems.

> If there are outstanding items in progress, we can branch off 1.11.21
> and 1.12.13 and have the release address only this issue.

Well, I am aware is that the native windows build for 1.12.14 is broken
(at least according to the nightly builds).

Note that 1.12.14 also does add the OpenPGP feature which I have not yet
used very much. I did see something odd in the way of a core dump when
attempting to sign a version 1.1 of a file in a tree that was mangled
partially with cvs 1.12.13.1 and partly with cvs 1.11.18 which I have
not yet tracked down (a quick report of how to reproduce it follows my
.signature).

So, it may be that 1.12.13.1 is not presently stable enough to release
as 1.12.14.

Note: It is probably going to be desirable to tell people about
gpg-agent
(http://lists.gnupg.org/pipermail/gnupg-announce/2005q2/000196.html),
but as I do not typically want to keep such an agent around on a
multi-user system, my example below does not use it.

        -- Mark

1:address@hidden PATH=`pwd`:$PATH; export PATH
2:address@hidden /bin/rm -fr /tmp/mdb-repos-gpg
3:address@hidden cvs --version

Concurrent Versions System (CVS) 1.12.13.1 (client/server)

Copyright (C) 2006 Free Software Foundation, Inc.

Senior active maintainers include Larry Jones, Derek R. Price,
and Mark D. Baushke.  Please see the AUTHORS and README files from the CVS
distribution kit for a complete list of contributors and copyrights.

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS
4:address@hidden cvs -d /tmp/mdb-repos-gpg init

You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

                  
You need a passphrase to unlock the secret key for
user: "Mark D Baushke <address@hidden>"
1024-bit DSA key, ID 6B039C51, created 2005-07-15

5:address@hidden cvs -d /tmp/mdb-repos-gpg co -d top .
cvs checkout: Updating top
cvs checkout: Updating top/CVSROOT
U top/CVSROOT/checkoutlist
U top/CVSROOT/commitinfo
U top/CVSROOT/config
U top/CVSROOT/cvswrappers
U top/CVSROOT/loginfo
U top/CVSROOT/modules
U top/CVSROOT/notify
U top/CVSROOT/postadmin
U top/CVSROOT/postproxy
U top/CVSROOT/posttag
U top/CVSROOT/postwatch
U top/CVSROOT/preproxy
U top/CVSROOT/rcsinfo
U top/CVSROOT/taginfo
U top/CVSROOT/verifymsg
6:address@hidden cd top

/tmp/ccvs/src/top
7:address@hidden mkdir mydir
8:address@hidden cvs add mydir
Directory /tmp/mdb-repos-gpg/mydir added to the repository
9:address@hidden cd mydir

/tmp/ccvs/src/top/mydir
10:address@hidden echo hello world > hello.txt
11:address@hidden cvs add hello.txt
cvs add: scheduling file `hello.txt' for addition
cvs add: use `cvs commit' to add this file permanently
12:address@hidden /usr/local/bin/cvs ci -m hello hello.txt
cvs commit: /tmp/mdb-repos-gpg/CVSROOT/config: unrecognized keyword 
'UseNewInfoFmtStrings'
RCS file: /tmp/mdb-repos-gpg/mydir/hello.txt,v
done
Checking in hello.txt;
/tmp/mdb-repos-gpg/mydir/hello.txt,v  <--  hello.txt
initial revision: 1.1
done
13:address@hidden cvs sign hello.txt
Segmentation fault (core dumped)
14:address@hidden /usr/local/bin/cvs --version

Concurrent Versions System (CVS) 1.11.18 (client/server)

Copyright (c) 1989-2004 Brian Berliner, david d `zoo' zuhn, 
                        Jeff Polk, and other authors

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS
15:address@hidden gdb ../../cvs core.8809 
GNU gdb Red Hat Linux (6.1post-1.20040607.43rh)
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "i386-redhat-linux-gnu"...Using host libthread_db 
library "/lib/tls/libthread_db.so.1".

Core was generated by `cvs sign hello.txt'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /lib/tls/librt.so.1...done.
Loaded symbols for /lib/tls/librt.so.1
Reading symbols from /lib/libcrypt.so.1...done.
Loaded symbols for /lib/libcrypt.so.1
Reading symbols from /lib/libcrypto.so.4...done.
Loaded symbols for /lib/libcrypto.so.4
Reading symbols from /lib/libresolv.so.2...done.
Loaded symbols for /lib/libresolv.so.2
Reading symbols from /lib/libcom_err.so.2...done.
Loaded symbols for /lib/libcom_err.so.2
Reading symbols from /lib/libnsl.so.1...done.
Loaded symbols for /lib/libnsl.so.1
Reading symbols from /lib/tls/libc.so.6...done.
Loaded symbols for /lib/tls/libc.so.6
Reading symbols from /usr/lib/libgssapi_krb5.so.2...done.
Loaded symbols for /usr/lib/libgssapi_krb5.so.2
Reading symbols from /usr/lib/libkrb5.so.3...done.
Loaded symbols for /usr/lib/libkrb5.so.3
Reading symbols from /lib/tls/libpthread.so.0...done.
Loaded symbols for /lib/tls/libpthread.so.0
Reading symbols from /lib/ld-linux.so.2...done.
Loaded symbols for /lib/ld-linux.so.2
Reading symbols from /usr/lib/libk5crypto.so.3...done.
Loaded symbols for /usr/lib/libk5crypto.so.3
Reading symbols from /lib/libdl.so.2...done.
Loaded symbols for /lib/libdl.so.2
Reading symbols from /usr/lib/libz.so.1...done.
Loaded symbols for /usr/lib/libz.so.1
#0  0x0806a420 in addnode (list=0x0, p=0x97aa858) at hash.c:332
332       return insert_before (list, list->list, p);
(gdb)  bt
#0  0x0806a420 in addnode (list=0x0, p=0x97aa858) at hash.c:332
#1  0x08089f12 in RCS_add_openpgp_signature (finfo=0xbfede960, 
    rev=0x97aa050 "1.1") at rcs.c:4887
#2  0x0809bc30 in sign_fileproc (callerdat=0xbfedeae8, finfo=0xbfede960)
    at sign.c:508
#3  0x0808c18d in do_file_proc (p=0x0, closure=0xbfede950) at recurse.c:990
#4  0x0806a5c6 in walklist (list=0x97aa170, proc=0x808c134 <do_file_proc>, 
    closure=0xbfede950) at hash.c:427
#5  0x0808bd41 in do_recursion (frame=0xbfedea40) at recurse.c:878
#6  0x0808d1fb in unroll_files_proc (p=0x97a9a08, closure=0xbfedea40)
    at recurse.c:1375
#7  0x0806a5c6 in walklist (list=0x97a9a08, 
    proc=0x808d0e8 <unroll_files_proc>, closure=0xbfedea40) at hash.c:427
#8  0x0808cc79 in start_recursion (fileproc=0x809bb24 <sign_fileproc>, 
    filesdoneproc=0, direntproc=0, dirleaveproc=0, callerdat=0xbfedeae8, 
    argc=1, argv=0x97a9658, local=0, which=1, aflag=0, locktype=2, 
    update_preload=0x97a99f8 "1.1", dosrcs=1, 
    repository_in=0xbfedea40 "$ยป\t\b") at recurse.c:479
#9  0x0809bf2d in sign (argc=1, argv=0xbfedec9c) at sign.c:654
#10 0x08079458 in main (argc=2, argv=0xbfedec98) at main.c:1366
(gdb)  p p
$1 = (Node *) 0x97aa858
(gdb) p *p
$2 = {type = RCSSTRING, next = 0x0, prev = 0x0, hashnext = 0x0, 
  hashprev = 0x0, key = 0x97aa880 "openpgp-signatures", data = 0x0, len = 0, 
  delproc = 0}
(gdb) quit
16:address@hidden uname -a
Linux mdb-fc3 2.6.10-1.766_FC3smp #1 SMP Wed Feb 9 23:21:37 EST 2005 i686 i686 
i386 GNU/Linux
17:address@hidden cat /etc/redhat-release
Fedora Core release 3 (Heidelberg)
18:address@hidden 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEiMhOCg7APGsDnFERAsBLAKCsDt1O8QgIqH0O7Wyq5HRmFP/F4wCgsI1Z
E55O5rTFcw2UWtdwp2Dv//s=
=KftH
-----END PGP SIGNATURE-----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]