On Fri, Apr 3, 2015 at 2:53 PM, Luke Diamand <l...@diamand.org> wrote: > The add-new-file and copy-existing-file tests from > t9816-git-p4-locked.sh now pass. Update the test > case accordingly.
This patch should be folded into patch 3/4, shouldn't it? > Signed-off-by: Luke Diamand <l...@diamand.org> > --- > t/t9816-git-p4-locked.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh > index 464f10b..d048bd3 100755 > --- a/t/t9816-git-p4-locked.sh > +++ b/t/t9816-git-p4-locked.sh > @@ -35,7 +35,7 @@ test_expect_success 'edit with lock not taken' ' > ) > ' > > -test_expect_failure 'add with lock not taken' ' > +test_expect_success 'add with lock not taken' ' > test_when_finished cleanup_git && > git p4 clone --dest="$git" //depot && > ( > @@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' ' > ) > ' > > -test_expect_failure 'copy with lock taken' ' > +test_expect_success 'copy with lock taken' ' > lock_in_another_client && > test_when_finished cleanup_git && > test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" && > -- > 2.3.0.rc1.30.g76afe74 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
