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.
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
===================================================================
File: Base.hpp Status: Up-to-date
Working revision: 1.5
Repository revision: 1.5 /.../Base.hpp,v
Expansion option: kv
Commit Identifier: f6c47c440c10c50
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
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:
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:
+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:
+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:
+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:
+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:
+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:
+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:
+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:
+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:
+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:
+41 -9; kopt: kv; commitid: ee047bf46c44c00; filename: Base.hpp;
=============================================================================
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
===================================================================
File: Base.hpp Status: Up-to-date
Working revision: 1.5
Repository revision: 1.5 /.../Base.hpp,v
Expansion option: kv
Commit Identifier: f6c47c440c10c50
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Merge From: (none)