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>
148 lines
3.5 KiB
Bash
Executable File
148 lines
3.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2009 Vitaly Shukela
|
|
# Copyright (c) 2009 Eric Wong
|
|
#
|
|
|
|
test_description='git svn property tests'
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup test repository' '
|
|
svn_cmd co "$svnrepo" s &&
|
|
(
|
|
cd s &&
|
|
mkdir qqq www &&
|
|
echo test_qqq > qqq/test_qqq.txt &&
|
|
echo test_www > www/test_www.txt &&
|
|
svn_cmd add qqq &&
|
|
svn_cmd add www &&
|
|
svn_cmd commit -m "create some files" &&
|
|
svn_cmd up &&
|
|
echo hi >> www/test_www.txt &&
|
|
svn_cmd commit -m "modify www/test_www.txt" &&
|
|
svn_cmd up
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone an SVN repository with ignored www directory' '
|
|
git svn clone --ignore-paths="^www" "$svnrepo" g &&
|
|
echo test_qqq > expect &&
|
|
for i in g/*/*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect expect2
|
|
'
|
|
|
|
test_expect_success 'init+fetch an SVN repository with ignored www directory' '
|
|
git svn init "$svnrepo" c &&
|
|
( cd c && git svn fetch --ignore-paths="^www" ) &&
|
|
rm expect2 &&
|
|
echo test_qqq > expect &&
|
|
for i in c/*/*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect expect2
|
|
'
|
|
|
|
test_expect_success 'verify ignore-paths config saved by clone' '
|
|
(
|
|
cd g &&
|
|
git config --get svn-remote.svn.ignore-paths | fgrep "www"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change outside of www' '
|
|
(
|
|
cd s &&
|
|
echo b >> qqq/test_qqq.txt &&
|
|
svn_cmd commit -m "SVN-side change outside of www" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change outside of www"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (config ignore)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (option ignore)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --ignore-paths="^www" &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change inside of ignored www' '
|
|
(
|
|
cd s &&
|
|
echo zaq >> www/test_www.txt
|
|
svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (config ignore)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo (option ignore)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --ignore-paths="^www" &&
|
|
printf "test_qqq\nb\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'SVN-side change in and out of ignored www' '
|
|
(
|
|
cd s &&
|
|
echo cvf >> www/test_www.txt
|
|
echo ygg >> qqq/test_qqq.txt
|
|
svn_cmd commit -m "SVN-side change in and out of ignored www" &&
|
|
svn_cmd up &&
|
|
svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo again (config ignore)' '
|
|
(
|
|
cd g &&
|
|
git svn rebase &&
|
|
printf "test_qqq\nb\nygg\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_expect_success 'update git svn-cloned repo again (option ignore)' '
|
|
(
|
|
cd c &&
|
|
git svn rebase --ignore-paths="^www" &&
|
|
printf "test_qqq\nb\nygg\n" > expect &&
|
|
for i in */*.txt; do cat $i >> expect2; done &&
|
|
test_cmp expect2 expect &&
|
|
rm expect expect2
|
|
)
|
|
'
|
|
|
|
test_done
|