From 92d99c04b37e536ef01dad4f9936a67f1da710fa Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Sun, 11 Jun 2006 13:05:02 +0100 Subject: [PATCH] Fix the t1201-pull-trailing.sh test The test was expecting a failure but StGIT actually does a three-way merge that succeeds. Signed-off-by: Catalin Marinas --- t/t1201-pull-trailing.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh index e5fac88..42c6619 100755 --- a/t/t1201-pull-trailing.sh +++ b/t/t1201-pull-trailing.sh @@ -40,7 +40,7 @@ test_expect_success \ ) " -test_expect_failure \ +test_expect_success \ 'Try to push those patches without merge detection' \ "(cd bar && stg push --all ) @@ -48,7 +48,7 @@ test_expect_failure \ test_expect_success \ 'Pull those patches applied upstream' \ - "(cd bar && stg push --all --merged + "(cd bar && stg push --undo && stg push --all --merged ) " -- 2.11.0