commit - 680b44a7e950277747770bc4302b55d2830e48df
commit + 7b074ee1ba7f2a0f63c30e6fee0f3715f0c3d2ed
blob - 7c4cb85d8227a063941751ef9ab3b14e99b8243f
blob + c1ba086fddfabba986cee70eaa3e56b5c3814489
--- regress/cmdline/update.sh
+++ regress/cmdline/update.sh
test_done "$testroot" "0"
}
+
+test_update_changes_file_to_dir() {
+ local testroot=`test_init update_changes_file_to_dir`
+
+ got checkout $testroot/repo $testroot/wt > /dev/null
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+ git_rm $testroot/repo alpha
+ mkdir $testroot/repo/alpha
+ echo eta > $testroot/repo/alpha/eta
+ (cd $testroot/repo && git add alpha/eta)
+ git_commit $testroot/repo -m "changed alpha into directory"
+
+ (cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ ret="xfail change file into directory"
+ fi
+ test_done "$testroot" "$ret"
+}
+
test_update_merges_file_edits() {
local testroot=`test_init update_merges_file_edits`
run_test test_update_creates_missing_parent
run_test test_update_creates_missing_parent_with_subdir
run_test test_update_file_in_subsubdir
+run_test test_update_changes_file_to_dir
run_test test_update_merges_file_edits
run_test test_update_keeps_xbit
run_test test_update_clears_xbit