Index: testcvs.py
===================================================================
RCS file: /usr/local/cvs/cvsnt/testcvs/testcvs.py,v
retrieving revision 1.20.2.7
diff -u -r1.20.2.7 testcvs.py
--- testcvs.py	9 Jan 2005 21:18:14 -0000	1.20.2.7
+++ testcvs.py	14 May 2005 07:16:00 -0000
@@ -218,6 +218,19 @@
   cvs_pass('update binary_test.gif')
   file_compare(test_data+'/binary_test.gif',current_tree+'/testcvs/binary_test.gif')
 
+  start_test('Binary remove and revert')
+  
+  file_copy(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_rm_test.gif')
+  cvs_pass('add -kb binary_rm_test.gif')
+  cvs_pass('commit -m "" binary_rm_test.gif')
+  file_exists(current_tree+'/testcvs/binary_rm_test.gif')
+  cvs_pass('remove -f binary_rm_test.gif')
+  file_not_exists(current_tree+'/testcvs/binary_rm_test.gif')
+  cvs_pass('commit -m "" binary_rm_test.gif')
+  cvs_pass('update -r 1.1 binary_rm_test.gif')
+  file_exists(current_tree+'/testcvs/binary_rm_test.gif')
+  file_compare(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_rm_test.gif')
+
   start_test('Binary delta Add/Checkout')
   
   os.chdir(current_tree+'/testcvs')
@@ -259,7 +272,7 @@
     file_copy(test_data+'/maastrict.txt',current_tree+'/testcvs/maastrict.txt')
     cvs_pass('commit -f -m "" maastrict.txt') 
 
-  start_test('Checkout/Diff different versions of a file')
+  start_test('Checkout/Diff different versions of a text file')
 
   os.chdir(current_tree+'/testcvs')
   file_copy(test_data+'/diff_test.txt.1',current_tree+'/testcvs/diff_test.txt')
@@ -267,6 +280,7 @@
   cvs_pass('commit -m "" diff_test.txt')
   file_copy(test_data+'/diff_test.txt.2',current_tree+'/testcvs/diff_test.txt')
   cvs_pass('commit -f -m "" diff_test.txt')
+  cvs_pass('tag sticky_tag_test_symbolic_tag diff_test.txt')
   file_copy(test_data+'/diff_test.txt.3',current_tree+'/testcvs/diff_test.txt')
   cvs_pass('commit -f -m "" diff_test.txt')
   file_copy(test_data+'/diff_test.txt.4',current_tree+'/testcvs/diff_test.txt')
@@ -296,6 +310,24 @@
   cvs_fail('-q diff -r 1.2 diff_test.txt') # CVS always returns 1
   file_compare(outfile,test_data+'/diff_test.diff.3')
 
+  start_test('Checkout/Diff different versions of a binary file')
+
+  file_copy(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('commit -m "" binary_test.gif')
+  cvs_pass('tag sticky_tag_test_symbolic_tag binary_test.gif')
+  file_copy(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('commit -m "" binary_test.gif')
+  cvs_pass('tag sticky_tag_test_symbolic_tag')
+  cvs_pass('update -r 1.1 binary_test.gif')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('update -r 1.2 binary_test.gif')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('update -r 1.3 binary_test.gif')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_test.gif')
+
   start_test('Branching')
 
   cvs_pass('update -r 1.3 diff_test.txt')
@@ -310,6 +342,46 @@
   cvs_pass('commit -m "" diff_test.txt')
   cvs_pass('log -t diff_test.txt')
   file_compare(outfile,test_data+'/branch_test.txt.3')
+
+  start_test('Sticky tag test (symbolic)')
+
+  cvs_pass('update -r sticky_tag_test_symbolic_tag')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_compare(test_data+'/diff_test.txt.2',current_tree+'/testcvs/diff_test.txt')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+
+  start_test('Sticky tag test (symbolic+update)')
+  cvs_pass('update')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_compare(test_data+'/diff_test.txt.2',current_tree+'/testcvs/diff_test.txt')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('update -A')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_copy(test_data+'/diff_test.txt.4',current_tree+'/testcvs/diff_test.txt')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_test.gif')
+  
+  start_test('Sticky tag test (revision)')
+  cvs_pass('update -r 1.2 diff_test.txt')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_compare(test_data+'/diff_test.txt.2',current_tree+'/testcvs/diff_test.txt')
+  cvs_pass('update -r 1.2 binary_test.gif')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+
+  start_test('Sticky tag test (revision+update)')
+  cvs_pass('update')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_compare(test_data+'/diff_test.txt.2',current_tree+'/testcvs/diff_test.txt')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test3.gif',current_tree+'/testcvs/binary_test.gif')
+  cvs_pass('update -A')
+  file_exists(current_tree+'/testcvs/diff_test.txt')
+  file_copy(test_data+'/diff_test.txt.4',current_tree+'/testcvs/diff_test.txt')
+  file_exists(current_tree+'/testcvs/binary_test.gif')
+  file_compare(test_data+'/binary_test4.gif',current_tree+'/testcvs/binary_test.gif')
 
   start_test('Merging')
 
Index: test_data/branch_test.txt.3
===================================================================
RCS file: /usr/local/cvs/cvsnt/testcvs/test_data/branch_test.txt.3,v
retrieving revision 1.2
diff -u -r1.2 branch_test.txt.3
--- test_data/branch_test.txt.3	7 Feb 2003 17:46:00 -0000	1.2
+++ test_data/branch_test.txt.3	14 May 2005 04:03:36 -0000
@@ -7,6 +7,7 @@
 access list:
 symbolic names:
 	branch_test: 1.3.0.2
+	sticky_tag_test_symbolic_tag: 1.2
 keyword substitution: kv
 total revisions: 6
 description: