CVS update [cvs1-11-x-branch]: /ccvs/src/

Tag: cvs1-11-x-branch
User: dprice  
Date: 05/05/27 10:47:02

Modified:
 /ccvs/src/
  ChangeLog, sanity.sh

Log:
 * sanity.sh (diff-addrm): Add test for bug fixed some time ago.

File Changes:

Directory: /ccvs/src/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.2336.2.373&r2=1.2336.2.374
Delta lines:  +4 -0
-------------------
--- ChangeLog	27 May 2005 16:28:00 -0000	1.2336.2.373
+++ ChangeLog	27 May 2005 17:46:54 -0000	1.2336.2.374
@@ -1,5 +1,9 @@
 2005-05-27  Derek Price  <[email protected]>
 
+	* sanity.sh (diff-addrm): Add test for bug fixed some time ago.
+
+2005-05-27  Derek Price  <[email protected]>
+
 	* client.c (send_arg): Make arg const.
 	(send_option_string): Rename to...
 	(send_options): ...this and accept argc/argv in place of string.

File [changed]: sanity.sh
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/sanity.sh?r1=1.752.2.171&r2=1.752.2.172
Delta lines:  +53 -2
--------------------
--- sanity.sh	27 May 2005 16:25:11 -0000	1.752.2.171
+++ sanity.sh	27 May 2005 17:46:54 -0000	1.752.2.172
@@ -1081,7 +1081,7 @@
 	tests="${tests} status"
 	# Branching, tagging, removing, adding, multiple directories
 	tests="${tests} rdiff rdiff-short"
-	tests="${tests} rdiff2 diff diffnl death death2"
+	tests="$tests rdiff2 diff diff-addrm diffnl death death2"
 	tests="${tests} rm-update-message rmadd rmadd2 rmadd3 resurrection"
 	tests="${tests} dirs dirs2 branches branches2 tagc tagf tag-space"
 	tests="${tests} rcslib multibranch import importb importc import-CVS"
@@ -4651,7 +4651,7 @@
 "${testcvs} add file2.txt" \
 "${PROG} add: scheduling file .file2\.txt' for addition
 ${PROG} add: use .${PROG} commit. to add this file permanently"
-	  dotest rdiff-add-remove-nodiff-init-11 \
+	  dotest rdiff-short-init-11 \
 "${testcvs} commit -madd-file2 file2.txt" \
 "RCS file: ${CVSROOT_DIRNAME}/abc/file2\.txt,v
 done
@@ -4830,6 +4830,57 @@
 	  rm -r 1
 	  ;;
 
+
+
+	diff-addrm)
+	  # It used to be the case that when a file was added and removed
+	  # between two tags, it would still show up as added in a diff.
+	  mkdir $CVSROOT_DIRNAME/first-dir
+	  mkdir 1; cd 1
+
+	  dotest diff-addrm-init-1 "$testcvs -Q co first-dir"
+	  cd first-dir
+	  echo content >file1
+	  dotest diff-addrm-init-2 "$testcvs -Q add file1"
+	  dotest diff-addrm-init-3 "$testcvs -Q ci -m." \
+"RCS file: $CVSROOT_DIRNAME/first-dir/file1,v
+done
+Checking in file1;
+$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
+initial revision: 1\.1
+done"
+	  dotest diff-addrm-init-4 "$testcvs -Q tag firsttag"
+	  echo other content >file2
+	  dotest diff-addrm-init-5 "$testcvs -Q add file2"
+	  dotest diff-addrm-init-6 "$testcvs -Q ci -madd" \
+"RCS file: $CVSROOT_DIRNAME/first-dir/file2,v
+done
+Checking in file2;
+$CVSROOT_DIRNAME/first-dir/file2,v  <--  file2
+initial revision: 1\.1
+done"
+	  dotest diff-addrm-init-7 "$testcvs -Q rm -f file2"
+	  dotest diff-addrm-init-8 "$testcvs -Q ci -mrm" \
+"Removing file2;
+$CVSROOT_DIRNAME/first-dir/file2,v  <--  file2
+new revision: delete; previous revision: 1\.1
+done"
+	  dotest diff-addrm-init-9 "$testcvs -Q tag secondtag"
+
+	  dotest diff-addrm-1 "$testcvs -q diff -rfirsttag -rsecondtag"
+
+	  if $keep; then
+	    echo Keeping $TESTDIR and exiting due to --keep
+	    exit 0
+	  fi
+
+	  cd ../..
+	  rm -rf $CVSROOT_DIRNAME/first-dir
+	  rm -r 1
+	  ;;
+
+
+
 	diffnl)
 	  # Test handling of 'cvs diff' of files without newlines
 	  mkdir 1; cd 1