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.
Here's a detailed log of a session showing the problem. Attached are
.directory_history,v and file_renamed.txt,v.
C:\cvs\test\sub5>cvs version
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)
C:\cvs\test>mkdir sub5
C:\cvs\test>cvs add sub5
Directory /dynon/test/sub5 added to the repository
C:\cvs\test>cd sub5
C:\cvs\test\sub5>notepad file.txt
C:\cvs\test\sub5>cvs add file.txt
cvs server: scheduling file `file.txt' for addition
cvs server: use 'cvs commit' to add this file permanently
C:\cvs\test\sub5>cvs commit -m "added"
cvs commit: Examining .
RCS file: /dynon/test/sub5/file.txt,v
done
Checking in file.txt;
/dynon/test/sub5/file.txt,v <-- file.txt
initial revision: 1.1
done
C:\cvs\test\sub5>notepad file.txt
C:\cvs\test\sub5>cvs commit -m "modified"
cvs commit: Examining .
Checking in file.txt;
/dynon/test/sub5/file.txt,v <-- file.txt
new revision: 1.2; previous revision: 1.1
done
C:\cvs\test\sub5>cvs tag -b "branch1"
cvs server: Tagging .
T file.txt
C:\cvs\test\sub5>notepad file.txt
C:\cvs\test\sub5>cvs commit -m "modified on trunk"
cvs commit: Examining .
Checking in file.txt;
/dynon/test/sub5/file.txt,v <-- file.txt
new revision: 1.3; previous revision: 1.2
done
C:\cvs\test\sub5>cvs update -r "branch1"
cvs server: Updating .
P file.txt
C:\cvs\test\sub5>notepad file.txt
C:\cvs\test\sub5>cvs commit -m "modified on branch"
cvs commit: Examining .
Checking in file.txt;
/dynon/test/sub5/file.txt,v <-- file.txt
new revision: 1.2.2.1; previous revision: 1.2
done
C:\cvs\test\sub5>cvs log file.txt
RCS file: /dynon/test/sub5/file.txt,v
Working file: file.txt
head: 1.3
branch:
locks: strict
access list:
symbolic names:
branch1: 1.2.0.2
keyword substitution: kv
total revisions: 4; selected revisions: 4
description:
----------------------------
revision 1.3
date: 2007/07/11 20:35:55; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: 105c46953f2a0eac; filename: file.txt;
modified on trunk
----------------------------
revision 1.2
date: 2007/07/11 20:34:39; author: bks; state: Exp; lines: +1 -0; kopt:
kv; commitid: 103446953ede0db3; filename: file.txt;
branches: 1.2.2;
modified
----------------------------
revision 1.1
date: 2007/07/11 20:34:06; author: bks; state: Exp; kopt: kv; commitid:
103446953ebe0d4b; filename: file.txt;
added
----------------------------
revision 1.2.2.1
date: 2007/07/11 20:37:19; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: f1c46953f7f0fc1; filename: file.txt;
modified on branch
======================================
C:\cvs\test\sub5>cvs update -A
cvs server: Updating .
P file.txt
C:\cvs\test\sub5>cvs rename file.txt file_renamed.txt
cvs rename: Warning: rename is still experimental and may not behave as you
would expect
C:\cvs\test\sub5>cvs commit -m "renamed file.txt to file_renamed.txt"
cvs commit: Examining .
cvs server: Examining .
/dynon/test/sub5/.directory_history,v <-- directory update
new revision: 1.2; previous revision: 1.1
done
C:\cvs\test\sub5>cvs log file.txt
cvs server: nothing known about file.txt
C:\cvs\test\sub5>cvs log file_renamed.txt
RCS file: /dynon/test/sub5/file_renamed.txt,v
Working file: file_renamed.txt
head: 1.3
branch:
locks: strict
access list:
symbolic names:
branch1: 1.2.0.2
keyword substitution: kv
total revisions: 4; selected revisions: 4
description:
----------------------------
revision 1.3
date: 2007/07/11 20:35:55; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: 105c46953f2a0eac; filename: file.txt;
modified on trunk
----------------------------
revision 1.2
date: 2007/07/11 20:34:39; author: bks; state: Exp; lines: +1 -0; kopt:
kv; commitid: 103446953ede0db3; filename: file.txt;
branches: 1.2.2;
modified
----------------------------
revision 1.1
date: 2007/07/11 20:34:06; author: bks; state: Exp; kopt: kv; commitid:
103446953ebe0d4b; filename: file.txt;
added
----------------------------
revision 1.2.2.1
date: 2007/07/11 20:37:19; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: f1c46953f7f0fc1; filename: file.txt;
modified on branch
======================================
C:\cvs\test\sub5>cvs update -r "branch1"
cvs server: Updating .
P file_renamed.txt
C:\cvs\test\sub5>ls
CVS file_renamed.txt
C:\cvs\test\sub5>cvs update -A
cvs server: Updating .
P file_renamed.txt
C:\cvs\test\sub5>notepad file_renamed.txt
C:\cvs\test\sub5>cvs commit -m "modified on trunk"
cvs commit: Examining .
Checking in file_renamed.txt;
/dynon/test/sub5/file.txt,v <-- file_renamed.txt
new revision: 1.4; previous revision: 1.3
done
C:\cvs\test\sub5>cvs log file_renamed.txt
RCS file: /dynon/test/sub5/file_renamed.txt,v
Working file: file_renamed.txt
head: 1.4
branch:
locks: strict
access list:
symbolic names:
branch1: 1.2.0.2
keyword substitution: kv
total revisions: 5; selected revisions: 5
description:
----------------------------
revision 1.4
date: 2007/07/11 20:41:25; author: bks; state: Exp; lines: +1 -0; kopt:
kv; commitid: 101c4695407512e4; filename: file_renamed.txt;
modified on trunk
----------------------------
revision 1.3
date: 2007/07/11 20:35:55; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: 105c46953f2a0eac; filename: file.txt;
modified on trunk
----------------------------
revision 1.2
date: 2007/07/11 20:34:39; author: bks; state: Exp; lines: +1 -0; kopt:
kv; commitid: 103446953ede0db3; filename: file.txt;
branches: 1.2.2;
modified
----------------------------
revision 1.1
date: 2007/07/11 20:34:06; author: bks; state: Exp; kopt: kv; commitid:
103446953ebe0d4b; filename: file.txt;
added
----------------------------
revision 1.2.2.1
date: 2007/07/11 20:37:19; author: bks; state: Exp; lines: +2 -0; kopt:
kv; commitid: f1c46953f7f0fc1; filename: file.txt;
modified on branch
======================================
C:\cvs\test\sub5>cvs update -r "branch1"
cvs server: Updating .
P file_renamed.txt
C:\cvs\test\sub5>cvs status file.txt
=================================File: no file file.txt Status: Unknown
Working revision: No entry for file.txt
Repository revision: No revision control file
C:\cvs\test\sub5>cvs status file_renamed.txt
=================================File: file_renamed.txt Status: Up-to-date
Working revision: 1.2.2.1
Repository revision: 1.2.2.1 /dynon/test/sub5/file_renamed.txt,v
Expansion option: kv
Commit Identifier: f1c46953f7f0fc1
Sticky Tag: branch1 (branch: 1.2.2)
Sticky Date: (none)
Sticky Options: (none)
Merge From: (none)
C:\cvs\test\sub5>cvs update -A
cvs server: Updating .
P file_renamed.txt
C:\cvs\test\sub5>cvs update -r1.1 file_renamed.txt
U file_renamed.txt
C:\cvs\test\sub5>ls
CVS file_renamed.txt
--
Bryce Schober