Your message dated Mon, 06 Jun 2005 22:22:55 +0200 with message-id <[EMAIL PROTECTED]> and subject line Not a bug 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; 14 Jun 2002 22:17:34 +0000 >From [EMAIL PROTECTED] Fri Jun 14 17:17:34 2002 Return-path: <[EMAIL PROTECTED]> Received: from postfix3-2.free.fr [213.228.0.169] by master.debian.org with esmtp (Exim 3.12 1 (Debian)) id 17IzNu-0006bA-00; Fri, 14 Jun 2002 17:17:34 -0500 Received: from localhost (nas-cbv-4-62-147-143-142.dial.proxad.net [62.147.143.142]) by postfix3-2.free.fr (Postfix) with ESMTP id C36891802C; Sat, 15 Jun 2002 00:17:30 +0200 (CEST) Received: from dwitch by localhost with local (Exim 3.35 #1 (Debian)) id 17IzBZ-0006C8-00; Sat, 15 Jun 2002 00:04:49 +0200 Date: Sat, 15 Jun 2002 00:04:49 +0200 From: Yann Dirson <[EMAIL PROTECTED]> To: Debian Bug Tracking System <[EMAIL PROTECTED]> Subject: prcs checkin -n does not show added files Message-ID: <[EMAIL PROTECTED]> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.4i X-Reportbug-Version: 1.99.40 Sender: Yann Dirson <[EMAIL PROTECTED]> Delivered-To: [EMAIL PROTECTED] Package: prcs Version: 1.3.2-3 Severity: normal When a merge has both "add" and "replace" actions, on checkin we get a notice about each "replace", but none for "add"s. This is quite inconsistent. Sample session: tau-2.11.13[1803]$ prcs checkout -r tau-2.11.13.@ tau prcs: Checkout project `tau' version tau-2.11.13.1. tau-2.11.13[1804]$ prcs merge -r debian prcs: Working version: tau-2.11.13.1(w) prcs: Common version: tau-2.11.12.1 prcs: Selected version: debian.9 prcs: *** Action on file `utils/FixMakefile' prcs: Choose an action on file `utils/FixMakefile' for rule 3: All three files exist and are alike in the working and common versions. Please select(dnmrhvq!?)[r] prcs: Replace file `utils/FixMakefile' by rule 3 prcs: *** Action on file `src/Profile/Makefile' prcs: Choose an action on file `src/Profile/Makefile' for rule 3: All three files exist and are alike in the working and common versions. Please select(dnmrhvq!?)[r] prcs: Replace file `src/Profile/Makefile' by rule 3 prcs: *** Action on file `configure' prcs: Choose an action on file `configure' for rule 3: All three files exist and are alike in the working and common versions. Please select(dnmrhvq!?)[r] prcs: Replace file `configure' by rule 3 prcs: *** Action on file `debian/compat' prcs: Choose an action on file `debian/compat' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/compat' by rule 14 prcs: *** Action on file `debian/rules' prcs: Choose an action on file `debian/rules' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/rules' by rule 14 prcs: *** Action on file `debian/control' prcs: Choose an action on file `debian/control' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/control' by rule 14 prcs: *** Action on file `debian/copyright' prcs: Choose an action on file `debian/copyright' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/copyright' by rule 14 prcs: *** Action on file `debian/changelog' prcs: Choose an action on file `debian/changelog' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/changelog' by rule 14 prcs: *** Action on file `debian/tau.docs' prcs: Choose an action on file `debian/tau.docs' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/tau.docs' by rule 14 prcs: *** Action on file `debian/TODO' prcs: Choose an action on file `debian/TODO' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/TODO' by rule 14 prcs: *** Action on file `debian/tau-examples.examples' prcs: Choose an action on file `debian/tau-examples.examples' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/tau-examples.examples' by rule 14 prcs: *** Action on file `debian/tau.dirs' prcs: Choose an action on file `debian/tau.dirs' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/tau.dirs' by rule 14 prcs: *** Action on file `debian/tau-racy.dirs' prcs: Choose an action on file `debian/tau-racy.dirs' for rule 14: Only the selected file is present. Please select(anhvq!?)[a] prcs: Add file `debian/tau-racy.dirs' by rule 14 prcs: Merge against version debian.9 complete. tau-2.11.13[1805]$ prcs checkin -r debian -n prcs: Checking in project `tau' version debian.10. prcs: File `utils/tau_convert.c' changes versions. prcs: File `include/Makefile' changes versions. tau-2.11.13[1806]$ prcs checkin -r debian prcs: Checking in project `tau' version debian.10. Empty New-Version-Log. Enter a log, or proceed(epq?)[p] e prcs: Enter description terminated by a single '.' or EOF. >> New upstream release 2.11.13 >> . Done. tau-2.11.13[1807]$ -- System Information Debian Release: 3.0 Architecture: i386 Kernel: Linux bylbo 2.4.17-smp+evms+kdb #1 SMP mer mar 27 00:23:14 CET 2002 i686 Locale: LANG=français, LC_CTYPE=français Versions of packages prcs depends on: ii libc6 2.2.5-6 GNU C Library: Shared libraries an ii libstdc++2.10-glibc2.2 1:2.95.4-9 The GNU stdc++ library ii rcs 5.7-13 The GNU Revision Control System -- no debconf information -- Yann Dirson <[EMAIL PROTECTED]> | Why make M$-Bill richer & richer ? Debian-related: <[EMAIL PROTECTED]> | Support Debian GNU/Linux: Pro: <[EMAIL PROTECTED]> | Freedom, Power, Stability, Gratuity http://ydirson.free.fr/ | Check <http://www.debian.org/> --------------------------------------- Received: (at 150022-done) by bugs.debian.org; 6 Jun 2005 20:22:56 +0000 >From [EMAIL PROTECTED] Mon Jun 06 13:22:56 2005 Return-path: <[EMAIL PROTECTED]> Received: from yeast.orebokech.com [82.67.41.165] (romain) by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1DfO7b-0003ag-00; Mon, 06 Jun 2005 13:22:55 -0700 Received: from pacem.orebokech.com (pacem.orebokech.com [192.168.1.3]) by yeast.orebokech.com (Postfix) with ESMTP id 4311512E8D for <[EMAIL PROTECTED]>; Mon, 6 Jun 2005 22:22:53 +0200 (CEST) Received: by pacem.orebokech.com (Postfix, from userid 1000) id 5A1FDB31F0; Mon, 6 Jun 2005 22:22:55 +0200 (CEST) From: Romain Francoise <[EMAIL PROTECTED]> To: [EMAIL PROTECTED] Subject: Not a bug Organization: The Debian Project Mail-Copies-To: nobody Date: Mon, 06 Jun 2005 22:22:55 +0200 Message-ID: <[EMAIL PROTECTED]> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Delivered-To: [EMAIL PROTECTED] 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=-3.0 required=4.0 tests=BAYES_00 autolearn=no version=2.60-bugs.debian.org_2005_01_02 X-Spam-Level: Sorry but this is a not a bug: if you checkin on the same branch as the one you merged from, the files aren't added. When you checkin, PRCS compares the previous project on this branch and your new local version of the project, both contain the files you added during the merge and they aren't "added". If you checkin on another branch, 'prcs checkin -n' will correctly show the files as added. If you want to see the files you added to the project _locally_ by merging your "debian" branch, use prcsstatus. -- ,''`. : :' : Romain Francoise <[EMAIL PROTECTED]> `. `' http://people.debian.org/~rfrancoise/ `- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]