20563 |
# Now update the second copy. When using remote CVS, the |
# Now update the second copy. When using remote CVS, the |
20564 |
# patch will fail, forcing the file to be refetched. |
# patch will fail, forcing the file to be refetched. |
20565 |
cd ../../2/first-dir |
cd ../../2/first-dir |
20566 |
dotest serverpatch-8 "$testcvs -q update" 'U file1' |
dotest serverpatch-8 "$testcvs -q update" 'U file1' \ |
20567 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
20568 |
|
$CPROG client: refetching unpatchable files |
20569 |
|
U file1" |
20570 |
|
|
20571 |
dokeep |
dokeep |
20572 |
cd ../.. |
cd ../.. |
24785 |
# associated with the current base version of the file in the |
# associated with the current base version of the file in the |
24786 |
# sandbox is not available in these cases. See the note in the |
# sandbox is not available in these cases. See the note in the |
24787 |
# patch_file function in update.c. |
# patch_file function in update.c. |
24788 |
dotest keyword-21 "$testcvs -q update -r tag1" "U file1" |
dotest keyword-21 "${testcvs} -q update -r tag1" "U file1" \ |
24789 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
24790 |
|
$CPROG client: refetching unpatchable files |
24791 |
|
U file1" |
24792 |
|
|
24793 |
dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$' |
dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$' |
24794 |
|
|
24795 |
# Like serverpatch-8, a patch is refetched here. |
if $remote; then |
24796 |
dotest keyword-23 "$testcvs update -A file1" "U file1" |
# Like serverpatch-8. Not sure there is anything much we |
24797 |
|
# can or should do about this. |
24798 |
|
dotest keyword-23r "${testcvs} update -A file1" \ |
24799 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
24800 |
|
$CPROG client: refetching unpatchable files |
24801 |
|
U file1" |
24802 |
|
else |
24803 |
|
dotest keyword-23 "${testcvs} update -A file1" "U file1" |
24804 |
|
fi |
24805 |
dotest keyword-24 "cat file1" '\$'"Name: "'\$'" |
dotest keyword-24 "cat file1" '\$'"Name: "'\$'" |
24806 |
change" |
change" |
24807 |
|
|
25153 |
# An update -kk or -A will unsub and sub keywords without updates |
# An update -kk or -A will unsub and sub keywords without updates |
25154 |
# being required. |
# being required. |
25155 |
# FIXCVS - see note above keyword-21 |
# FIXCVS - see note above keyword-21 |
25156 |
dotest keywordname-update-1 "$testcvs -q up -rbr" "U file1" |
dotest keywordname-update-1 "${testcvs} -q up -rbr" "U file1" \ |
25157 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
25158 |
|
$CPROG client: refetching unpatchable files |
25159 |
|
U file1" |
25160 |
dotest keywordname-update-2 "cat file1" '\$'"Name: br "'\$' |
dotest keywordname-update-2 "cat file1" '\$'"Name: br "'\$' |
25161 |
dotest keywordname-update-3 "cat file2" '\$'"Name: "'\$' |
dotest keywordname-update-3 "cat file2" '\$'"Name: "'\$' |
25162 |
|
|
25166 |
"T file1 |
"T file1 |
25167 |
T file2" |
T file2" |
25168 |
# FIXCVS - see note above keyword-21 |
# FIXCVS - see note above keyword-21 |
25169 |
dotest keywordname-update-5 "$testcvs -q up -A" "U file1" |
dotest keywordname-update-5 "${testcvs} -q up -A" "U file1" \ |
25170 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
25171 |
|
$CPROG client: refetching unpatchable files |
25172 |
|
U file1" |
25173 |
dotest keywordname-update-6 "cat file1" \ |
dotest keywordname-update-6 "cat file1" \ |
25174 |
'\$'"Name: "'\$'" |
'\$'"Name: "'\$'" |
25175 |
new data" |
new data" |
25177 |
|
|
25178 |
# But updating to a static tag does cause a substitution |
# But updating to a static tag does cause a substitution |
25179 |
# FIXCVS - see same note above |
# FIXCVS - see same note above |
25180 |
dotest keywordname-update-8 "$testcvs -q up -rfirsttag" "U file1" |
dotest keywordname-update-8 "${testcvs} -q up -rfirsttag" "U file1" \ |
25181 |
|
"$CPROG update: checksum failure after patch to \`\./file1'; will refetch |
25182 |
|
$CPROG client: refetching unpatchable files |
25183 |
|
U file1" |
25184 |
dotest keywordname-update-9 "cat file1" '\$'"Name: firsttag "'\$' |
dotest keywordname-update-9 "cat file1" '\$'"Name: firsttag "'\$' |
25185 |
dotest keywordname-update-10 "cat file2" '\$'"Name: "'\$' |
dotest keywordname-update-10 "cat file2" '\$'"Name: "'\$' |
25186 |
|
|
25187 |
# And reverify the trunk update when the change is actually removed. |
# And reverify the trunk update when the change is actually removed. |
25188 |
dotest keywordname-update-11 "$testcvs -q up -A" "U file1" |
dotest keywordname-update-11 "${testcvs} -q up -A" "U file1" \ |
25189 |
|
"$CPROG update: checksum failure after patch to \`./file1'; will refetch |
25190 |
|
$CPROG client: refetching unpatchable files |
25191 |
|
U file1" |
25192 |
dotest keywordname-update-12 "cat file1" \ |
dotest keywordname-update-12 "cat file1" \ |
25193 |
'\$'"Name: "'\$'" |
'\$'"Name: "'\$'" |
25194 |
new data" |
new data" |