diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-05-23 19:23:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 21:37:30 -0700 |
| commit | 36f5b1f0c800a23b9755a0214c1c3250f34f2486 (patch) | |
| tree | 87abde66321dcd36c413d0a4855a8620f225fa2c /contrib/git-svn/t/lib-git-svn.sh | |
| parent | git-svn: starting a 1.1.0-pre development version (diff) | |
| download | git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.tar.gz git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.zip | |
git-svn: ignore expansion of svn:keywords
Unlike my earlier test patch, this also checks svn:eol-style and
makes sure it's applied to working copy updates. This is
definitely more correct than my original attempt at killing
keyword expansions, but I still haven't tested it enough to
know. Feedback would be much appreciated.
Also changed assert_svn_wc_clean() to only work on the svn
working copy. This requires a separate call to assert_tree() to
check wc integrity against git in preparation for another change
I'm planning.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'contrib/git-svn/t/lib-git-svn.sh')
| -rw-r--r-- | contrib/git-svn/t/lib-git-svn.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/contrib/git-svn/t/lib-git-svn.sh b/contrib/git-svn/t/lib-git-svn.sh new file mode 100644 index 0000000000..a98e9d164d --- /dev/null +++ b/contrib/git-svn/t/lib-git-svn.sh @@ -0,0 +1,39 @@ +PATH=$PWD/../:$PATH +if test -d ../../../t +then + cd ../../../t +else + echo "Must be run in contrib/git-svn/t" >&2 + exit 1 +fi + +. ./test-lib.sh + +GIT_DIR=$PWD/.git +GIT_SVN_DIR=$GIT_DIR/git-svn +SVN_TREE=$GIT_SVN_DIR/tree + +svnadmin >/dev/null 2>&1 +if test $? != 1 +then + test_expect_success 'skipping contrib/git-svn test' : + test_done + exit +fi + +svn >/dev/null 2>&1 +if test $? != 1 +then + test_expect_success 'skipping contrib/git-svn test' : + test_done + exit +fi + +svnrepo=$PWD/svnrepo + +set -e + +svnadmin create $svnrepo +svnrepo="file://$svnrepo/test-git-svn" + + |