mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
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>
39 lines
923 B
Bash
Executable file
39 lines
923 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git svn tracking removed top-level path'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'make history for tracking' '
|
|
mkdir import &&
|
|
mkdir import/trunk &&
|
|
echo hello >> import/trunk/README &&
|
|
svn_cmd import -m initial import "$svnrepo" &&
|
|
rm -rf import &&
|
|
svn_cmd co "$svnrepo"/trunk trunk &&
|
|
echo bye bye >> trunk/README &&
|
|
svn_cmd rm -m "gone" "$svnrepo"/trunk &&
|
|
rm -rf trunk &&
|
|
mkdir trunk &&
|
|
echo "new" > trunk/FOLLOWME &&
|
|
svn_cmd import -m "new trunk" trunk "$svnrepo"/trunk
|
|
'
|
|
|
|
test_expect_success 'clone repo with git' '
|
|
git svn clone -s "$svnrepo" x &&
|
|
test -f x/FOLLOWME &&
|
|
test ! -f x/README
|
|
'
|
|
|
|
test_expect_success 'make sure r2 still has old file' "
|
|
cd x &&
|
|
test -n \"\$(git svn find-rev r1)\" &&
|
|
git reset --hard \$(git svn find-rev r1) &&
|
|
test -f README &&
|
|
test ! -f FOLLOWME &&
|
|
test x\$(git svn find-rev r2) = x
|
|
"
|
|
|
|
test_done
|