8630 |
# one revision with the working copy. |
# one revision with the working copy. |
8631 |
|
|
8632 |
modify_repo mkdir $CVSROOT_DIRNAME/first-dir |
modify_repo mkdir $CVSROOT_DIRNAME/first-dir |
8633 |
dotest rcsdiff-1 "${testcvs} -q co first-dir" '' |
dotest rcslib-diff1 "${testcvs} -q co first-dir" '' |
8634 |
cd first-dir |
cd first-dir |
8635 |
echo "I am the first foo, and my name is $""Name$." > foo.c |
echo "I am the first foo, and my name is $""Name$." > foo.c |
8636 |
dotest rcsdiff-2 "${testcvs} add -m new-file foo.c" \ |
dotest rcslib-diff2 "${testcvs} add -m new-file foo.c" \ |
8637 |
"${SPROG} add: scheduling file .foo\.c. for addition |
"${SPROG} add: scheduling file .foo\.c. for addition |
8638 |
${SPROG} add: use .${SPROG} commit. to add this file permanently" |
${SPROG} add: use .${SPROG} commit. to add this file permanently" |
8639 |
dotest rcsdiff-3 "${testcvs} commit -m rev1 foo.c" \ |
dotest rcslib-diff3 "${testcvs} commit -m rev1 foo.c" \ |
8640 |
"${CVSROOT_DIRNAME}/first-dir/foo.c,v <-- foo\.c |
"${CVSROOT_DIRNAME}/first-dir/foo.c,v <-- foo\.c |
8641 |
initial revision: 1\.1" |
initial revision: 1\.1" |
8642 |
dotest rcsdiff-4 "${testcvs} tag first foo.c" "T foo\.c" |
dotest rcslib-diff4 "${testcvs} tag first foo.c" "T foo\.c" |
8643 |
dotest rcsdiff-5 "${testcvs} update -p -r first foo.c" \ |
dotest rcslib-diff5 "${testcvs} update -p -r first foo.c" \ |
8644 |
"=================================================================== |
"=================================================================== |
8645 |
Checking out foo\.c |
Checking out foo\.c |
8646 |
RCS: ${CVSROOT_DIRNAME}/first-dir/foo\.c,v |
RCS: ${CVSROOT_DIRNAME}/first-dir/foo\.c,v |
8649 |
I am the first foo, and my name is \$""Name: first \$\." |
I am the first foo, and my name is \$""Name: first \$\." |
8650 |
|
|
8651 |
echo "I am the second foo, and my name is $""Name$." > foo.c |
echo "I am the second foo, and my name is $""Name$." > foo.c |
8652 |
dotest rcsdiff-6 "${testcvs} commit -m rev2 foo.c" \ |
dotest rcslib-diff6 "${testcvs} commit -m rev2 foo.c" \ |
8653 |
"${CVSROOT_DIRNAME}/first-dir/foo\.c,v <-- foo\.c |
"${CVSROOT_DIRNAME}/first-dir/foo\.c,v <-- foo\.c |
8654 |
new revision: 1\.2; previous revision: 1\.1" |
new revision: 1\.2; previous revision: 1\.1" |
8655 |
dotest rcsdiff-7 "${testcvs} tag second foo.c" "T foo\.c" |
dotest rcslib-diff7 "${testcvs} tag second foo.c" "T foo\.c" |
8656 |
dotest rcsdiff-8 "${testcvs} update -p -r second foo.c" \ |
dotest rcslib-diff8 "${testcvs} update -p -r second foo.c" \ |
8657 |
"=================================================================== |
"=================================================================== |
8658 |
Checking out foo\.c |
Checking out foo\.c |
8659 |
RCS: ${CVSROOT_DIRNAME}/first-dir/foo\.c,v |
RCS: ${CVSROOT_DIRNAME}/first-dir/foo\.c,v |
8661 |
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* |
\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* |
8662 |
I am the second foo, and my name is \$""Name: second \$\." |
I am the second foo, and my name is \$""Name: second \$\." |
8663 |
|
|
8664 |
dotest_fail rcsdiff-9 "${testcvs} diff -r first -r second" \ |
dotest_fail rcslib-diff9 "${testcvs} diff -r first -r second" \ |
8665 |
"${SPROG} diff: Diffing \. |
"${SPROG} diff: Diffing \. |
8666 |
Index: foo\.c |
Index: foo\.c |
8667 |
=================================================================== |
=================================================================== |
8675 |
> I am the second foo, and my name is \$""Name: \$\." |
> I am the second foo, and my name is \$""Name: \$\." |
8676 |
|
|
8677 |
echo "I am the once and future foo, and my name is $""Name$." > foo.c |
echo "I am the once and future foo, and my name is $""Name$." > foo.c |
8678 |
dotest_fail rcsdiff-10 "${testcvs} diff -r first" \ |
dotest_fail rcslib-diff10 "${testcvs} diff -r first" \ |
8679 |
"${SPROG} diff: Diffing \. |
"${SPROG} diff: Diffing \. |
8680 |
Index: foo\.c |
Index: foo\.c |
8681 |
=================================================================== |
=================================================================== |