Bug#177879: marked as done (prcs: prcs aborts when attempting to remove Populate-Ignore patterns during a merge)
Your message dated Mon, 06 Jun 2005 15:48:05 -0400
with message-id <E1DfNZt-00005E-00@newraff.debian.org>
and subject line Bug#177879: fixed in prcs 1.3.3-5
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 22 Jan 2003 12:02:44 +0000
>From raph@lrde.epita.fr Wed Jan 22 06:02:44 2003
Return-path: <raph@lrde.epita.fr>
Received: from hermes.epita.fr (epita.fr) [163.5.255.10]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 18bJae-0007Qg-00; Wed, 22 Jan 2003 06:02:44 -0600
Received: from kualalumpur.lrde.epita.fr (mail@kualalumpur.lrde.epita.fr [10.223.13.1])
by epita.fr id h0MC2cS26925
Wed, 22 Jan 2003 13:02:38 +0100 (MET)
Received: from nostromo.lrde.epita.fr ([10.223.13.52] ident=mail)
by kualalumpur.lrde.epita.fr with esmtp (Exim 3.35 #1 (Debian))
id 18bJan-0007iy-00; Wed, 22 Jan 2003 13:02:53 +0100
Received: from raph by nostromo.lrde.epita.fr with local (Exim 3.36 #1 (Debian))
id 18bJan-0008Io-00; Wed, 22 Jan 2003 13:02:53 +0100
From: <raph@epita.fr>
Subject: prcs: prcs aborts when attempting to remove Populate-Ignore patterns during a merge
To: submit@bugs.debian.org
X-Mailer: bug 3.3.10.2
Message-Id: <E18bJan-0008Io-00@nostromo.lrde.epita.fr>
Sender: Raphael Poss <raph@lrde.epita.fr>
Date: Wed, 22 Jan 2003 13:02:53 +0100
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=0.3 required=5.0
tests=NO_REAL_NAME,SPAM_PHRASE_00_01
version=2.41
X-Spam-Level:
Package: prcs
Version: 1.3.2-6
Severity: important
The bug is easily reproducible.
Here is a sample transcript :
Script started on Wed Jan 22 12:45:40 2003
raph@nostromo /tmp/prcs$ export PRCS_REPOSITORY=~prcs/repository
raph@nostromo /tmp/prcs$ # <context>project foo was just created, empty</context>
raph@nostromo /tmp/prcs$ prcs checkout foo
prcs: Checkout project `foo' version 0.1.
raph@nostromo /tmp/prcs$ vi foo.prj
raph@nostromo /tmp/prcs$ prcs checkin
prcs: Checking in project `foo' version 0.2.
No modifications were found. Abort(nyq?)[y] n
Empty New-Version-Log. Enter a log, or proceed(epq?)[p]
raph@nostromo /tmp/prcs$ mkdir ../other-dir && cd ../other-dir
raph@nostromo /tmp/other-dir$ prcs checkout foo
prcs: Checkout project `foo' version 0.2.
raph@nostromo /tmp/other-dir$ vi foo.prj
raph@nostromo /tmp/other-dir$ vi diff ../prcs/foo.prj foo.prj
10c10
< (Populate-Ignore ("foo$"))
---
> (Populate-Ignore ())
raph@nostromo /tmp/other-dir$ prcs checkin
prcs: Checking in project `foo' version 0.3.
No modifications were found. Abort(nyq?)[y] n
Empty New-Version-Log. Enter a log, or proceed(epq?)[p]
raph@nostromo /tmp/other-dir$ cd ../prcs
raph@nostromo /tmp/prcs$ prcs merge
prcs: Working version: 0.2(w)
prcs: Common version: 0.2
prcs: Selected version: 0.3
prcs: *** Action on populate ignore element `foo$'
prcs: Choose an action on populate ignore element `foo$' for rule 7: Working and
common files are alike; selected file not present.
Please select(dnhq!?)[d]
prcs: Internal error, attempting to drop core.
prcs: Please report this to prcs-bugs@XCF.Berkeley.EDU.
prcs: When sending bug reports, always include:
prcs: -- a complete description of the problem encountered
prcs: -- the output of `prcs config'
prcs: -- the operating system and version
prcs: -- the architecture.
prcs: If possible, include:
prcs: -- the file `/tmp/prcs_bug', if it exists
prcs: -- the working project file, if one was in use
prcs: -- the output of `ls -lR' in the current directory.
prcs: Disk space permitting, retain the following:
prcs: -- any relevant working project files
prcs: -- a repository package created with `prcs package PROJECT'.
prcs: Disk space not permitting, retain just:
prcs: -- the repository file PRCS/PROJECT/PROJECT.prj,v
prcs: -- the repository log PRCS/PROJECT/prcs_log
prcs: -- the repository data file PRCS/PROJECT/prcs_data
prcs: -- the output of `rlog' on each repository file under PRCS/PROJECT.
prcs: These steps will help diagnose the problem.
prcs: Merge incomplete.
zsh: abort prcs merge
Script done on Wed Jan 22 12:47:38 2003
The file /tmp/prcs_bug does not exist.
Here is the project file :
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 2)
(Project-Description "")
(Project-Version foo 0 2)
(Parent-Version foo 0 1)
(Version-Log "")
(New-Version-Log "")
(Checkin-Time "Wed, 22 Jan 2003 12:46:27 +0100")
(Checkin-Login raph)
(Populate-Ignore ())
(Project-Keywords)
(Files
)
(Merge-Parents)
(New-Merge-Parents
(0.3 incomplete)
)
It happens that /in fine/ the Populate-Ignore is effectively
removed, and one can complete a merge with successive runs
(and aborts) of prcs, until it eventually finishes successfully.
-- System Information
Debian Release: testing/unstable
Kernel Version: Linux nostromo 2.4.20 #2 Tue Dec 10 14:15:31 CET 2002 i686 unknown unknown GNU/Linux
Versions of the packages prcs depends on:
ii libc6 2.3.1-9 GNU C Library: Shared libraries and Timezone
ii libstdc++2.10- 2.95.4-15 The GNU stdc++ library
ii rcs 5.7-13 The GNU Revision Control System
---------------------------------------
Received: (at 177879-close) by bugs.debian.org; 6 Jun 2005 19:51:35 +0000
>From katie@ftp-master.debian.org Mon Jun 06 12:51:35 2005
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DfNdH-00030o-00; Mon, 06 Jun 2005 12:51:35 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1DfNZt-00005E-00; Mon, 06 Jun 2005 15:48:05 -0400
From: Romain Francoise <rfrancoise@debian.org>
To: 177879-close@bugs.debian.org
X-Katie: $Revision: 1.56 $
Subject: Bug#177879: fixed in prcs 1.3.3-5
Message-Id: <E1DfNZt-00005E-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Mon, 06 Jun 2005 15:48:05 -0400
Delivered-To: 177879-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
X-CrossAssassin-Score: 5
Source: prcs
Source-Version: 1.3.3-5
We believe that the bug you reported is fixed in the latest version of
prcs, which is due to be installed in the Debian FTP archive:
prcs-el_1.3.3-5_all.deb
to pool/main/p/prcs/prcs-el_1.3.3-5_all.deb
prcs-synch_1.3.3-5_all.deb
to pool/main/p/prcs/prcs-synch_1.3.3-5_all.deb
prcs-utils_1.3.3-5_all.deb
to pool/main/p/prcs/prcs-utils_1.3.3-5_all.deb
prcs-visualtree_1.3.3-5_all.deb
to pool/main/p/prcs/prcs-visualtree_1.3.3-5_all.deb
prcs_1.3.3-5.diff.gz
to pool/main/p/prcs/prcs_1.3.3-5.diff.gz
prcs_1.3.3-5.dsc
to pool/main/p/prcs/prcs_1.3.3-5.dsc
prcs_1.3.3-5_i386.deb
to pool/main/p/prcs/prcs_1.3.3-5_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 177879@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Romain Francoise <rfrancoise@debian.org> (supplier of updated prcs package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 6 Jun 2005 21:09:01 +0200
Source: prcs
Binary: prcs-visualtree prcs-synch prcs prcs-el prcs-utils
Architecture: source all i386
Version: 1.3.3-5
Distribution: unstable
Urgency: low
Maintainer: Romain Francoise <rfrancoise@debian.org>
Changed-By: Romain Francoise <rfrancoise@debian.org>
Description:
prcs - The Project Revision Control System
prcs-el - ELisp support for the Project Revision Control System
prcs-synch - Synchronize PRCS projects between repositories
prcs-utils - Utilities for PRCS
prcs-visualtree - Visualize PRCS projects in a graph
Closes: 134047 149811 156588 159853 177879 204265 268350 272152 287958 293805 294074 294221
Changes:
prcs (1.3.3-5) unstable; urgency=low
.
* The "Stayin' alive, stayin' alive" release.
.
* New maintainer (closes: #293805).
* debian/control: Update maintainer contact information.
.
* debian/prcs-el.emacsen-startup:
+ Use debian-pkg-add-load-path-item, don't special-case load-path
modification for Emacs 19 which is long gone (closes: #272152).
+ Do nothing if the package has been removed but not purged.
+ Add source files to load-path.
.
* debian/patches/10_prcs-el_dirs.dpatch: New patch to prcs-hooks.el,
wrap call to directory-files with condition-case to workaround a bug
where opening files in executable but non readable directories
signalled an error, many thanks to Aaron M. Ucko <ucko@debian.org>
(closes: #294074).
.
* debian/patches/20_prcs-mv.dpatch: New patch, bring prcs-mv in sync
with latest upstream (somewhat belatedly), patch submitted by Yann
Dirson <dirson@debian.org> (closes: #204265).
.
* debian/patches/30_diff-N-corruption.dpatch: New patch, fixes a bug
where calling 'prcs diff -N' on a project where files have been
locally removed would completely wipe the PRCS project file...
(closes: #159853).
.
* debian/patches/40_prcs_checkin.dpatch: New patch, initial checkins
cannot be run with --no-action because PRCS needs the repository
entry, clarify error message to make this more explicit in the command
output (closes: #149811).
.
* debian/patches/50_prcserror_segv.dpatch: New patch, check pointer in
prcserror.cc before dereferencing it to prevent a segmentation fault,
this could happen in some cases when removing already deleted
attributes from a project file during a merge (closes: #177879).
.
* debian/patches/60_prcs_empty-locks.dpatch: New patch, when trying to
get a lock on the repository, ignore empty lock files instead of
bailing out with the "Inconsistant lock information" message: empty
lock files get created when the filesystem runs out of space at
checkin time and we should just ignore them (closes: #156588).
.
* debian/patches/70_man_fixes.dpatch: New patch, fixes a few typos and
spelling errors in man pages.
.
* debian/patches/50_g++-3.4.dpatch: Dropped (it doesn't actually fix the
build with G++ 3.4).
* debian/patches/80_build_fixes.dpatch: New patch:
+ (Conditionally) use new __gnu_cxx::stdio_filebuf prototype for g++
versions newer than 3.3 (closes: #268350).
+ Change hash.cc to cast to long instead of int, for lack of a better
fix (closes: #287958).
+ Drop erroneous fdopen change from the previous patch (closes: #294221).
.
* debian/patches/90_prcs-synch_misc.dpatch: New patch to prcs-synch:
+ Change the doc to say 'prcs-synch' instead of 'synch' when referring
to the script since it's how it's called in Debian.
+ Apply a patch from "R. Church" <rc@ghostbitch.org> to fix
repository sync failures over SSH (closes: #134047).
.
* debian/patches/00list: Update.
* debian/control: Update build dependency on dpatch to >= 2.0.9 for the
new style patches.
Files:
05b74ef0dd7a6bed1949943c1774502c 684 devel optional prcs_1.3.3-5.dsc
17480e149d9a65a0c77bc19a443863e4 31579 devel optional prcs_1.3.3-5.diff.gz
75a26c23316f534066052f1790b853c5 52026 devel optional prcs-el_1.3.3-5_all.deb
77d1848abc6051a5ccf1b0c0df199a8d 32984 devel optional prcs-synch_1.3.3-5_all.deb
5b1ec3a0feb196244e0bd8fa585c2ccc 16552 devel optional prcs-visualtree_1.3.3-5_all.deb
3a47186648357b28a3eff46c144a9c17 48302 devel optional prcs-utils_1.3.3-5_all.deb
7bd0f1adba272352a99c2d55e4e8e8fa 389292 devel optional prcs_1.3.3-5_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCpKNjogN2vsA8Vt8RAvNQAJ9sUVV4xLiH6HIMZxh4G4+79ca1AACdGaI+
Yk0oAPsfnK21Uy8xBQg1RDE=
=3XV5
-----END PGP SIGNATURE-----
Reply to: