summaryrefslogtreecommitdiff
path: root/t/t9151-svn-mergeinfo.sh
diff options
context:
space:
mode:
authorAndrew Myrick <amyrick@apple.com>2010-01-21 21:55:48 (GMT)
committerEric Wong <normalperson@yhbt.net>2010-01-23 11:23:04 (GMT)
commitc79f1189bc4e7d9bb9cb673c043ce8f587a9a92d (patch)
tree628b45c6627f14919b6c769b8b996fe8fc9dc2a3 /t/t9151-svn-mergeinfo.sh
parenta65f3c202b8771f79117b566946d9cb3348f6fad (diff)
downloadgit-c79f1189bc4e7d9bb9cb673c043ce8f587a9a92d.zip
git-c79f1189bc4e7d9bb9cb673c043ce8f587a9a92d.tar.gz
git-c79f1189bc4e7d9bb9cb673c043ce8f587a9a92d.tar.bz2
git-svn: update svn mergeinfo test suite
Add a partial branch (e.g., a branch from a project subdirectory) to the git-svn mergeinfo test repository. Add a tag and a branch from that tag to the git-svn mergeinfo test repository. Update the test script to expect a known failure in git-svn exposed by these additions where merge info for partial branches is not preserved. Signed-off-by: Andrew Myrick <amyrick@apple.com> Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9151-svn-mergeinfo.sh')
-rwxr-xr-xt/t9151-svn-mergeinfo.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 359eeaa..3569c62 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit
[ -z "$bad_non_merges" ]
'
-test_expect_success 'everything got merged in the end' '
+test_expect_failure 'everything got merged in the end' '
unmerged=$(git rev-list --all --not master)
[ -z "$unmerged" ]
'