Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Furthermore I would like to know if tag bGeDev is indeed tied to revision 1.4. Unfortunately I'm not acquainted with mergepoints. I would like to know how it should work though. Because we work with multiple projects and multiple branches I don't like to rely on mergepoints. I always use 'cvs update -jstart_of_change -jend_of_change file.ext'. We use a lot of tags. So have you tried 'cvs update -j1.4.2.3 -j1.4.2.6 Base.hpp'?=20 Would the result be the same? I'm sorry I can't solve your problem straight away. But I can raise some questions. =20 I would like to know the how and why of your problem since I work with the same version of CVSNT. Let's hope someone does know why this happens. Regards, Frederik Krooshof Software engineer Raet| T +31(0)33 4506739 F +31(0)33 4506482 Postbus 1495, 3800 BL Amersfoort Plotterweg 38, 3821 BB Amersfoort The Netherlands www.raet.nl -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Gerhard Fiedler Sent: donderdag 13 maart 2008 13:52 To: cvsnt Mailing List Subject: [cvsnt] Merge doesn't remove file Hello, I have a file that has been removed on a branch, but when I merge that branch into HEAD, the file on HEAD doesn't get removed. Instead, I get a message that says "cvs server: file Base.hpp has been modified, but has been removed in revision bGeDev". (See the update command below.) The file is not modified on HEAD (see stat below). The only modifications are a few revisions on the branch after the last merge before the file got removed on the branch. But the last revision on the branch is dead (see log below). Yet, after the merge, the file in HEAD is untouched. Can anybody explain why it doesn't merge the remove from the branch to HEAD? Thanks, Gerhard d:\...>cvs ver Client: Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 2382 (client/server) Server: Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 2382 (client/server) d:\...>cvs stat Base.hpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D File: Base.hpp Status: Up-to-date =20 Working revision: 1.5 =20 Repository revision: 1.5 /.../Base.hpp,v =20 Expansion option: kv =20 Commit Identifier: f6c47c440c10c50 =20 Sticky Tag: (none) =20 Sticky Date: (none) =20 Sticky Options: (none) =20 Merge From: (none) d:\...>cvs log Base.hpp RCS file: /.../Base.hpp,v Working file: Base.hpp head: 1.5 branch: locks: strict access list: symbolic names: =20 bGeDev: 1.4.0.2 keyword substitution: kv total revisions: 11; selected revisions: 11 description: ---------------------------- revision 1.5 date: 2008/02/26 16:39:57; author: gerhard.fiedler; state: Exp; lines:=20 +138 -66; kopt: kv; commitid: f6c47c440c10c50; mergepoint: 1.4.2.3; filename: Base.hpp; ---------------------------- revision 1.4 date: 2008/02/20 23:32:28; author: gerhard.fiedler; state: Exp; lines:=20 +3 -1; kopt: kv; commitid: 98447bcb8817375; filename: Base.hpp; branches: 1.4.2; ---------------------------- revision 1.3 date: 2008/02/18 13:27:05; author: gerhard.fiedler; state: Exp; lines:=20 +42 -97; kopt: kv; commitid: c7047b987a207e7; filename: Base.hpp; ---------------------------- revision 1.2 date: 2008/02/10 19:10:06; author: gerhard.fiedler; state: Exp; lines:=20 +6 -6; kopt: kv; commitid: 90047af4c0d1d73; filename: Base.hpp; ---------------------------- revision 1.1 date: 2008/02/06 19:06:31; author: gerhard.fiedler; state: Exp; kopt: kv; commitid: ecc47aa04545f4a; filename: Base.hpp; ---------------------------- revision 1.4.2.6 date: 2008/03/01 03:07:42; author: gerhard.fiedler; state: dead; lines:=20 +1 -1; kopt: kv; commitid: f5447c8c875576a; filename: Base.hpp; ---------------------------- revision 1.4.2.5 date: 2008/02/29 02:37:55; author: gerhard.fiedler; state: Exp; lines:=20 +30 -29; kopt: kv; commitid: 75847c76ffb727f; filename: Base.hpp; ---------------------------- revision 1.4.2.4 date: 2008/02/27 00:59:54; author: gerhard.fiedler; state: Exp; lines:=20 +1 -2; kopt: kv; commitid: 39847c4b6000b30; filename: Base.hpp; ---------------------------- revision 1.4.2.3 date: 2008/02/26 16:36:19; author: gerhard.fiedler; state: Exp; lines:=20 +2 -2; kopt: kv; commitid: 87847c43ffb09c9; filename: Base.hpp; ---------------------------- revision 1.4.2.2 date: 2008/02/26 00:25:02; author: gerhard.fiedler; state: Exp; lines:=20 +120 -80; kopt: kv; commitid: b4047c35c54225e; filename: Base.hpp; ---------------------------- revision 1.4.2.1 date: 2008/02/22 22:03:56; author: gerhard.fiedler; state: Exp; lines:=20 +41 -9; kopt: kv; commitid: ee047bf46c44c00; filename: Base.hpp; =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D d:\...>cvs up -j bGeDev Base.hpp cvs server: file Base.hpp has been modified, but has been removed in revision bGeDev d:\...>cvs stat Base.hpp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D File: Base.hpp Status: Up-to-date =20 Working revision: 1.5 =20 Repository revision: 1.5 /.../Base.hpp,v =20 Expansion option: kv =20 Commit Identifier: f6c47c440c10c50 =20 Sticky Tag: (none) =20 Sticky Date: (none) =20 Sticky Options: (none) =20 Merge From: (none) _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs ---- De inhoud van dit bericht en de eventueel daarbij behorende bijlagen zijn= persoonlijk gericht aan en derhalve uitsluitend bestemd voor de geadresse= erde. De ontvanger die niet de geadresseerde is, noch bevoegd is dit bericht na= mens geadresseerde te ontvangen, wordt verzocht de afzender onmiddellijk op de= =20hoogte te stellen van de ontvangst. Elk gebruik van de inhoud van dit bericht en/of van de daarbij behorende = bijlagen door een ander dan de geadresseerde is onrechtmatig jegens de afzender. The content of this communication and any attachments are of a confidenti= al=20 nature and accordingly intended only to be read by the addressee. If anyone receives this communication who is not the addressee and is not= =20 authorised by the addressee to receive such communication then such perso= n=20 is requested to notify the sender immediately. Any use of the content of this communication or any attachments by anyone= =20 other than the addressee constitutes an unlawful act. ----