Merge branch 'nd/status-long'

diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index b00ad09d23d8e859d3b52c73579e84ad4620b36c..fe30ad881f67c9f1fdcb2ee40922880126ec13cc 100755 (executable)
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 rcs keywords'
+test_description='git p4 rcs keywords'
 
 . ./lib-git-p4.sh
 
@@ -147,7 +147,7 @@ test_expect_success 'scrub ko files differently' '
        )
 '
 
-# hack; git-p4 submit should do it on its own
+# hack; git p4 submit should do it on its own
 test_expect_success 'cleanup after failure' '
        (
                cd "$cli" &&
@@ -160,9 +160,6 @@ test_expect_success 'cleanup after failure' '
 # the cli file so that submit will get a conflict.  Make sure that
 # scrubbing doesn't make a mess of things.
 #
-# Assumes that git-p4 exits leaving the p4 file open, with the
-# conflict-generating patch unapplied.
-#
 # This might happen only if the git repo is behind the p4 repo at
 # submit time, and there is a conflict.
 #
@@ -181,19 +178,16 @@ test_expect_success 'do not scrub plain text' '
                        sed -i "s/^line5/line5 p4 edit/" file_text &&
                        p4 submit -d "file5 p4 edit"
                ) &&
-               ! git p4 submit &&
+               echo s | test_expect_code 1 git p4 submit &&
                (
-                       # exepct something like:
-                       #    file_text - file(s) not opened on this client
-                       # but not copious diff output
+                       # make sure the file is not left open
                        cd "$cli" &&
-                       p4 diff file_text >wc &&
-                       test_line_count = 1 wc
+                       ! p4 fstat -T action file_text
                )
        )
 '
 
-# hack; git-p4 submit should do it on its own
+# hack; git p4 submit should do it on its own
 test_expect_success 'cleanup after failure 2' '
        (
                cd "$cli" &&
@@ -244,7 +238,7 @@ test_expect_success 'cope with rcs keyword expansion damage' '
                cd "$git" &&
                git config git-p4.skipSubmitEdit true &&
                git config git-p4.attemptRCSCleanup true &&
-               (cd ../cli && p4_append_to_file kwfile1.c) &&
+               (cd "$cli" && p4_append_to_file kwfile1.c) &&
                old_lines=$(wc -l <kwfile1.c) &&
                "$PERL_PATH" -n -i -e "print unless m/Revision:/" kwfile1.c &&
                new_lines=$(wc -l <kwfile1.c) &&
@@ -343,44 +337,6 @@ test_expect_failure 'Add keywords in git which do not match the default p4 value
        )
 '
 
-# Check that the existing merge conflict handling still works.
-# Modify kwfile1.c in git, and delete in p4. We should be able
-# to skip the git commit.
-#
-test_expect_success 'merge conflict handling still works' '
-       test_when_finished cleanup_git &&
-       (
-               cd "$cli" &&
-               echo "Hello:\$Id\$" >merge2.c &&
-               echo "World" >>merge2.c &&
-               p4 add -t ktext merge2.c &&
-               p4 submit -d "add merge test file"
-       ) &&
-       git p4 clone --dest="$git" //depot &&
-       (
-               cd "$git" &&
-               sed -e "/Hello/d" merge2.c >merge2.c.tmp &&
-               mv merge2.c.tmp merge2.c &&
-               git add merge2.c &&
-               git commit -m "Modifying merge2.c"
-       ) &&
-       (
-               cd "$cli" &&
-               p4 delete merge2.c &&
-               p4 submit -d "remove merge test file"
-       ) &&
-       (
-               cd "$git" &&
-               test -f merge2.c &&
-               git config git-p4.skipSubmitEdit true &&
-               git config git-p4.attemptRCSCleanup true &&
-               !(echo "s" | git p4 submit) &&
-               git rebase --skip &&
-               ! test -f merge2.c
-       )
-'
-
-
 test_expect_success 'kill p4d' '
        kill_p4d
 '