commit - 5c23a559a76e204dc3d66ce265abeba149c1a3c2
commit + e6f45b7279f2ab31024ae32f7ad28148bf80bee7
blob - d90e1face424bb23b3129dd9b67d914a99c1abe4
blob + 5f8f09cafb0426ef5bc92fae1bf7d909c80282ad
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
@@ -479,7 +479,7 @@ EOF
 	got checkout -b foo $testroot/repo $testroot/wt > /dev/null
 
 	(cd $testroot/repo && ln -sf beta alpha.link)
-	(cd $testroot/repo && ln -sfT gamma epsilon.link)
+	(cd $testroot/repo && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
 	(cd $testroot/repo && ln -sf .got/foo $testroot/repo/dotgotfoo.link)
 	(cd $testroot/repo && git rm -q nonexistent.link)
@@ -657,7 +657,7 @@ test_cherrypick_symlink_conflicts() {
 
 	(cd $testroot/repo && ln -sf beta alpha.link)
 	(cd $testroot/repo && ln -sf beta boo.link)
-	(cd $testroot/repo && ln -sfT gamma epsilon.link)
+	(cd $testroot/repo && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
 	echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
 	(cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
@@ -674,9 +674,10 @@ test_cherrypick_symlink_conflicts() {
 	# modified symlink to file A vs modified symlink to file B
 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
 	# modified symlink to dir A vs modified symlink to file B
-	(cd $testroot/wt && ln -sfT beta epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
 	# modeified symlink to file A vs modified symlink to dir B
-	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
+	(cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
+		epsilon/beta.link)
 	# added regular file A vs added bad symlink to file A
 	(cd $testroot/wt && ln -sf .got/foo dotgotfoo.link)
 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)
blob - a2032490522a301669166115d59f44d3cf4d93d0
blob + 74cf5cf5b28feb35d4b3b9bde9ff356cc0f2586c
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
@@ -1402,7 +1402,7 @@ test_commit_symlink() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 	rm $testroot/wt/epsilon/beta.link
 	echo "this is a regular file" > $testroot/wt/epsilon/beta.link
 	(cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
@@ -1513,7 +1513,7 @@ test_commit_fix_bad_symlink() {
 	fi
 
 	# change "bad" symlink back into a "good" symlink
-	(cd $testroot/wt && ln -sfT alpha passwd.link)
+	(cd $testroot/wt && rm passwd.link && ln -s alpha passwd.link)
 
 	(cd $testroot/wt && got commit -m 'fix bad symlink' \
 		> $testroot/stdout)
blob - cdfcbf919035db7b57b79f083ae2ad1157d8b9d9
blob + 9ab729c90b157cfb194f331126a700a54e6c6344
--- regress/cmdline/diff.sh
+++ regress/cmdline/diff.sh
@@ -729,7 +729,7 @@ test_diff_symlinks_in_work_tree() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
 	echo -n '.got/bar' > $testroot/wt/dotgotfoo.link
 	(cd $testroot/wt && got rm nonexistent.link > /dev/null)
@@ -828,7 +828,7 @@ test_diff_symlinks_in_repo() {
 	local commit_id1=`git_show_head $testroot/repo`
 
 	(cd $testroot/repo && ln -sf beta alpha.link)
-	(cd $testroot/repo && ln -sfT gamma epsilon.link)
+	(cd $testroot/repo && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
 	(cd $testroot/repo && ln -sf .got/bar $testroot/repo/dotgotfoo.link)
 	(cd $testroot/repo && git rm -q nonexistent.link)
blob - 299d87314c0270628f8e1c8ececbfa4a336ab7d8
blob + e70257974f118426479de4291f7224d953e09e82
--- regress/cmdline/revert.sh
+++ regress/cmdline/revert.sh
@@ -1077,11 +1077,12 @@ test_revert_symlink() {
 	# symlink to file A now points to file B
 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
 	# symlink to a directory A now points to file B
-	(cd $testroot/wt && ln -sfT beta epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
 	# "bad" symlink now contains a different target path
 	echo "foo" > $testroot/wt/passwd.link
 	# relative symlink to directory A now points to relative directory B
-	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
+	(cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
+		epsilon/beta.link)
 	# an unversioned symlink
 	(cd $testroot/wt && ln -sf .got/foo dotgotfoo.link)
 	# symlink to file A now points to non-existent file B
@@ -1250,11 +1251,12 @@ test_revert_patch_symlink() {
 	# symlink to file A now points to file B
 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
 	# symlink to a directory A now points to file B
-	(cd $testroot/wt && ln -sfT beta epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
 	# "bad" symlink now contains a different target path
 	echo "foo" > $testroot/wt/passwd.link
 	# relative symlink to directory A now points to relative directory B
-	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
+	(cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
+		epsilon/beta.link)
 	# an unversioned symlink
 	(cd $testroot/wt && ln -sf .got/foo dotgotfoo.link)
 	# symlink to file A now points to non-existent file B
blob - 038d00ac14c1b4463693bd6a50b6607eab9dfba4
blob + 2da7971145c62f07fd34f488c546f17a4380fd12
--- regress/cmdline/stage.sh
+++ regress/cmdline/stage.sh
@@ -2439,7 +2439,7 @@ test_stage_symlink() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
 	echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)
@@ -2752,7 +2752,7 @@ test_stage_patch_symlink() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
 	echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)
blob - ea1578eb72862dd6ea902835f84e766890b1e94d
blob + c3dfaf5a6c26ee597b31705a4a382d777de7d6a2
--- regress/cmdline/status.sh
+++ regress/cmdline/status.sh
@@ -301,7 +301,7 @@ test_status_symlink() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 
 	(cd $testroot/wt && ln -s /etc/passwd passwd.link)
 	(cd $testroot/wt && ln -s ../beta epsilon/beta.link)
blob - 36c13bd74fc16e2567b89b5f4b06780dea4628b3
blob + ebf6d3cd41806a0cb17cdc6f75d6528777cf8631
--- regress/cmdline/unstage.sh
+++ regress/cmdline/unstage.sh
@@ -987,7 +987,7 @@ test_unstage_symlink() {
 	fi
 
 	(cd $testroot/wt && ln -sf beta alpha.link)
-	(cd $testroot/wt && ln -sfT gamma epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
 	echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)
@@ -1173,11 +1173,12 @@ test_unstage_patch_symlink() {
 	# symlink to file A now points to file B
 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
 	# symlink to a directory A now points to file B
-	(cd $testroot/wt && ln -sfT beta epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
 	# "bad" symlink now contains a different target path
 	echo "foo" > $testroot/wt/passwd.link
 	# relative symlink to directory A now points to relative directory B
-	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
+	(cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
+		epsilon/beta.link)
 	# an unversioned symlink
 	(cd $testroot/wt && ln -sf .got/foo dotgotfoo.link)
 	# symlink to file A now points to non-existent file B
blob - c1ba086fddfabba986cee70eaa3e56b5c3814489
blob + 0d8ff6767ff1c9ee4ac80bced71b0fd2ad8d1a39
--- regress/cmdline/update.sh
+++ regress/cmdline/update.sh
@@ -2045,7 +2045,7 @@ test_update_symlink_conflicts() {
 	fi
 
 	(cd $testroot/repo && ln -sf beta alpha.link)
-	(cd $testroot/repo && ln -sfT gamma epsilon.link)
+	(cd $testroot/repo && rm epsilon.link && ln -s gamma epsilon.link)
 	(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
 	echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
 	(cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
@@ -2059,9 +2059,10 @@ test_update_symlink_conflicts() {
 	# modified symlink to file A vs modified symlink to file B
 	(cd $testroot/wt && ln -sf gamma/delta alpha.link)
 	# modified symlink to dir A vs modified symlink to file B
-	(cd $testroot/wt && ln -sfT beta epsilon.link)
+	(cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
 	# modeified symlink to file A vs modified symlink to dir B
-	(cd $testroot/wt && ln -sfT ../gamma epsilon/beta.link)
+	(cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
+		epsilon/beta.link)
 	# added regular file A vs added bad symlink to file A
 	(cd $testroot/wt && ln -sf .got/bar dotgotfoo.link)
 	(cd $testroot/wt && got add dotgotfoo.link > /dev/null)