Actions:
|
2012-06-01 06:47 AEST by Glen Starrett - If the user has "a.txt" and "b.txt" in a sandbox and then:
* Delete b.txt
* cvs rename a.txt b.txt
* cd .. && commit
>> Now you have 2 versions of b.txt vying for the same spot in the sandbox.
Looks like the newer one (the renamed one) has hold on this spot:
>>>>
C:\Users\Glen Starrett\Documents\test\samp\samp>echo Hi > a.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>echo Hi > b.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs -q add a.txt b.txt && cvs -q
ci -m "" a.txt b.txt
cvsntsrv server: use 'cvsntsrv commit' to add these files permanently
RCS file: /myrepo/samp/samp/a.txt,v
done
Checking in a.txt;
/myrepo/samp/samp/a.txt,v <-- a.txt
initial revision: 1.1
done
RCS file: /myrepo/samp/samp/b.txt,v
done
Checking in b.txt;
/myrepo/samp/samp/b.txt,v <-- b.txt
initial revision: 1.1
done
C:\Users\Glen Starrett\Documents\test\samp\samp>del b.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs ren a.txt b.txt
cvs rename: Warning: Use rename only as described in the eBook "All About CVS".
C:\Users\Glen Starrett\Documents\test\samp\samp>cd ..
C:\Users\Glen Starrett\Documents\test\samp>cvs ci -m "renamed a to b"
cvs commit: Examining .
cvs commit: Examining icotest
cvs commit: Examining promo
cvs commit: Examining samp
cvs commit: Examining samp/samp
cvsntsrv server: Examining samp
cvsntsrv server: Examining samp/samp
Checking in hi1.txt;
/myrepo/samp/hi1.txt,v <-- hi1.txt
new revision: 1.22; previous revision: 1.21
done
/myrepo/samp/samp/.directory_history,v <-- directory update
new revision: 1.2; previous revision: 1.1
done
C:\Users\Glen Starrett\Documents\test\samp>cd samp
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs up -dP
cvsntsrv server: Updating .
cvsntsrv server: Updating samp
C:\Users\Glen Starrett\Documents\test\samp\samp>echo more stuff >> b.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs ci -m "more in b"
cvs commit: Examining .
cvs commit: Examining samp
Checking in b.txt;
/myrepo/samp/samp/a.txt,v <-- b.txt
new revision: 1.2; previous revision: 1.1
done
C:\Users\Glen Starrett\Documents\test\samp\samp>del b.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs up -dP
cvsntsrv server: Updating .
U b.txt
cvsntsrv server: Updating samp
C:\Users\Glen Starrett\Documents\test\samp\samp>type b.txt
Hi
more stuff
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs log b.txt
RCS file: /myrepo/samp/samp/b.txt,v
Working file: b.txt
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2012/05/31 19:42:39; author: Europa\Glen Starrett; state: Exp; lines: +
1 -0; kopt: kv; commitid: 15e04fc7c8197a40; username: Europa\Glen Starrett;
filename: b.txt;
more in b
----------------------------
revision 1.1
date: 2012/05/31 19:41:45; author: Europa\Glen Starrett; state: Exp; kopt: kv
; commitid: b704fc7c8fe7d2c; username: Europa\Glen Starrett; filename: a.txt;
*** empty log message ***
=============================================================================
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs log a.txt
cvsntsrv server: nothing known about a.txt
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs rlog samp/samp/b.txt
RCS file: /myrepo/samp/samp/b.txt,v
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1; selected revisions: 1
description:
----------------------------
revision 1.1
date: 2012/05/31 19:41:45; author: Europa\Glen Starrett; state: Exp; kopt: kv
; commitid: b704fc7c8fe7d2c; username: Europa\Glen Starrett; filename: b.txt;
*** empty log message ***
=============================================================================
C:\Users\Glen Starrett\Documents\test\samp\samp>cvs rlog samp/samp/a.txt
RCS file: /myrepo/samp/samp/a.txt,v
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2012/05/31 19:42:39; author: Europa\Glen Starrett; state: Exp; lines: +
1 -0; kopt: kv; commitid: 15e04fc7c8197a40; username: Europa\Glen Starrett;
filename: b.txt;
more in b
----------------------------
revision 1.1
date: 2012/05/31 19:41:45; author: Europa\Glen Starrett; state: Exp; kopt: kv
; commitid: b704fc7c8fe7d2c; username: Europa\Glen Starrett; filename: a.txt;
*** empty log message ***
=============================================================================
<<<< |