[cvsnt] rename breakage

[Bryce Schober]

More interesting wrongness, with your request in the middle, attached are
various ,v's:

C:\cvs\test\sub5>notepad file3.txt

C:\cvs\test\sub5>cvs add file3.txt
cvs server: scheduling file `file3.txt' for addition
cvs server: use 'cvs commit' to add this file permanently

C:\cvs\test\sub5>cvs commit -m "adding file3.txt"
cvs commit: Examining .
RCS file: /dynon/test/sub5/file3.txt,v
done
Checking in file3.txt;
/dynon/test/sub5/file3.txt,v  <--  file3.txt
initial revision: 1.1
done

C:\cvs\test\sub5>cvs rename file3.txt file3_renamed.txt
cvs rename: Warning: rename is still experimental and may not behave as you
would expect

C:\cvs\test\sub5>notepad file3_renamed.txt

C:\cvs\test\sub5>cvs commit -m "modified and renamed file3.txt to
file3_renamed.txt"
cvs commit: Examining .
Checking in file3_renamed.txt;
/dynon/test/sub5/file3.txt,v  <--  file3_renamed.txt
new revision: 1.2; previous revision: 1.1
done

C:\cvs\test\sub5>cvs update -r1.1 file3_renamed.txt
P file3_renamed.txt

C:\cvs\test\sub5>ls
CVS  file2_renamed.txt  file3_renamed.txt  file_renamed.txt

C:\cvs\test\sub5>cvs tag -b "branch1" file3_renamed.txt
T file3_renamed.txt

C:\cvs\test\sub5>cvs update -r "branch1"
cvs server: Updating .
cvs server: file2_renamed.txt is no longer in the repository
U file_renamed.txt

C:\cvs\test\sub5>ls
CVS  file3_renamed.txt  file_renamed.txt

C:\cvs\test\sub5>cd ..

C:\cvs\test>cvs co -d b1 -r branch1 test/sub5
cvs server: Updating b1
U b1/file3.txt
U b1/file_renamed.txt

C:\cvs\test>cd b1

C:\cvs\test\b1>ls
CVS  file3.txt  file_renamed.txt

C:\cvs\test\b1>notepad file3.txt

C:\cvs\test\b1>cvs commit -m "modified on branch"
cvs commit: Examining .
Checking in file3.txt;
/dynon/test/sub5/file3.txt,v  <--  file3.txt
new revision: 1.1.2.1; previous revision: 1.1
done

C:\cvs\test\b1>cvs log file3.txt

RCS file: /dynon/test/sub5/file3.txt,v
Working file: file3.txt
head: 1.2
branch:
locks: strict
access list:
symbolic names:
        branch1: 1.1.0.2
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.2
date: 2007/07/11 21:08:21;  author: bks;  state: Exp;  lines: +2 -0;  kopt:
kv;  commitid: d60469546c4277e;  filename: file3_renamed.txt;
modified and renamed file3.txt to file3_renamed.txt
----------------------------
revision 1.1
date: 2007/07/11 21:06:52;  author: bks;  state: Exp;  kopt: kv;  commitid:
c884695466c265f;  filename: file3.txt;
branches:  1.1.2;
adding file3.txt
----------------------------
revision 1.1.2.1
date: 2007/07/11 23:43:00;  author: bks;  state: Exp;  lines: +2 -0;  kopt:
kv;  commitid: 101446956b041ddf;  filename: file3.txt;
modified on branch
======================================
C:\cvs\test\b1>cvs update -A
cvs server: Updating .
U file2_renamed.txt
P file3.txt
P file_renamed.txt

C:\cvs\test\b1>ls
CVS  file2_renamed.txt  file3.txt  file_renamed.txt

C:\cvs\test\b1>cvs status file3.txt
=================================File: file3.txt         Status: Up-to-date

   Working revision:    1.2
   Repository revision: 1.2     /dynon/test/sub5/file3.txt,v
   Expansion option:    kv
   Commit Identifier:   d60469546c4277e
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)

C:\cvs\test\b1>cd ..

C:\cvs\test>cvs update -R -A
cvs server: Updating .
cvs server: Updating b1
cvs server: Updating sub
cvs server: Updating sub5
U sub5/file2_renamed.txt
P sub5/file3_renamed.txt
P sub5/file_renamed.txt

C:\cvs\test>cvs status b1\file3.txt
=================================File: file3.txt         Status: Up-to-date

   Working revision:    1.2
   Repository revision: 1.2     /dynon/test/sub5/file3.txt,v
   Expansion option:    kv
   Commit Identifier:   d60469546c4277e
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)
   Merge From:          (none)


C:\cvs\test>cvs status b1\file3_renamed.txt
cvs server: nothing known about b1/file3_renamed.txt
=================================File: no file file3_renamed.txt         Status: Unknown

   Working revision:    No entry for file3_renamed.txt
   Repository revision: No revision control file


C:\cvs\test>ls .\b1
CVS  file2_renamed.txt  file3.txt  file_renamed.txt


On 7/11/07, Arthur Barrett <arthur.barrett at march-hare.com> wrote:
>
>  Bryce,
>
> Thanks for that - I'll try and look at it later today but I may run out of
> time.
>
> After the rename/commit, if instead of issuing 'cvs update -r "branch1" '
> you do this - what happens (does it correctly get the un-renamed filename):
>
> cd ..
> cvs co -d b1 -r branch1 sub5
> cd b1
> cvs status file.txt
>
>
> Regards,
>
>
> Arthur
>
>



-- 
Bryce Schober