da083d688e
I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>
60 lines
1.2 KiB
Bash
Executable File
60 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Deskin Miller
|
|
#
|
|
|
|
test_description='git svn partial-rebuild tests'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'initialize svnrepo' '
|
|
mkdir import &&
|
|
(
|
|
cd import &&
|
|
mkdir trunk branches tags &&
|
|
cd trunk &&
|
|
echo foo > foo &&
|
|
cd .. &&
|
|
svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null &&
|
|
svn_cmd copy "$svnrepo"/trunk "$svnrepo"/branches/a \
|
|
-m "created branch a" &&
|
|
cd .. &&
|
|
rm -rf import &&
|
|
svn_cmd co "$svnrepo"/trunk trunk &&
|
|
cd trunk &&
|
|
echo bar >> foo &&
|
|
svn_cmd ci -m "updated trunk" &&
|
|
cd .. &&
|
|
svn_cmd co "$svnrepo"/branches/a a &&
|
|
cd a &&
|
|
echo baz >> a &&
|
|
svn_cmd add a &&
|
|
svn_cmd ci -m "updated a" &&
|
|
cd .. &&
|
|
git svn init --stdlayout "$svnrepo"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'import an early SVN revision into git' '
|
|
git svn fetch -r1:2
|
|
'
|
|
|
|
test_expect_success 'make full git mirror of SVN' '
|
|
mkdir mirror &&
|
|
(
|
|
cd mirror &&
|
|
git init &&
|
|
git svn init --stdlayout "$svnrepo" &&
|
|
git svn fetch &&
|
|
cd ..
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch from git mirror and partial-rebuild' '
|
|
git config --add remote.origin.url "file://$PWD/mirror/.git" &&
|
|
git config --add remote.origin.fetch refs/remotes/*:refs/remotes/* &&
|
|
git fetch origin &&
|
|
git svn fetch
|
|
'
|
|
|
|
test_done
|