commit - 960094b4eff0069984143900870f8486dbe0a08d
commit + fba9f79c4f8a59659511cef89c1fca8809a5dce4
blob - 0c33fc4f123153eadacfbd77cc65f72045a14e3b
blob + 0f286697ad1b06ad111fc5219182bebfe88e1ccc
--- regress/cmdline/cherrypick.sh
+++ regress/cmdline/cherrypick.sh
local commit_id1=`git_show_head $testroot/repo`
(cd $testroot/repo && ln -sf beta alpha.link)
+ (cd $testroot/repo && ln -sf beta boo.link)
(cd $testroot/repo && ln -sfh gamma epsilon.link)
(cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
# added bad symlink to file A vs added regular file A
echo 'this is regular file bar' > $testroot/wt/dotgotbar.link
(cd $testroot/wt && got add dotgotbar.link > /dev/null)
+ # added symlink to file A vs unversioned file A
+ echo 'this is unversioned file boo' > $testroot/wt/boo.link
# removed symlink to non-existent file A vs modified symlink
# to nonexistent file B
(cd $testroot/wt && ln -sf nonexistent2 nonexistent.link)
echo -n > $testroot/stdout.expected
echo "C alpha.link" >> $testroot/stdout.expected
echo "C epsilon/beta.link" >> $testroot/stdout.expected
- echo "C dotgotbar.link" >> $testroot/stdout.expected
+ # TODO: This is wrong! Unversioned file boo.link should be preserved.
+ echo "U boo.link" >> $testroot/stdout.expected
echo "C epsilon.link" >> $testroot/stdout.expected
+ echo "C dotgotbar.link" >> $testroot/stdout.expected
echo "U dotgotfoo.link" >> $testroot/stdout.expected
echo "D nonexistent.link" >> $testroot/stdout.expected
echo "! zeta.link" >> $testroot/stdout.expected
echo -n "" >> $testroot/content.expected
cp $testroot/wt/alpha.link $testroot/content
+ cmp -s $testroot/content.expected $testroot/content
+ ret="$?"
+ if [ "$ret" != "0" ]; then
+ diff -u $testroot/content.expected $testroot/content
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ # TODO: This is wrong! Unversioned file boo.link should be preserved.
+ if [ ! -h $testroot/wt/boo.link ]; then
+ echo "boo.link is not a symlink"
+ test_done "$testroot" "1"
+ return 1
+ fi
+
+ echo "beta" > $testroot/content.expected
+ cp $testroot/wt/boo.link $testroot/content
cmp -s $testroot/content.expected $testroot/content
ret="$?"
if [ "$ret" != "0" ]; then