t9150,t9151: Add rewrite-root option to init
The rewrite-root option seems to be a bit problematic with merge detecting, so it's better to have a merge detecting test with it turned on. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:

committed by
Eric Wong

parent
bf60fff8f1
commit
95109f2947
@ -11,6 +11,7 @@ test_expect_success 'load svk depot' "
|
|||||||
svnadmin load -q '$rawsvnrepo' \
|
svnadmin load -q '$rawsvnrepo' \
|
||||||
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
||||||
git svn init --minimize-url -R svkmerge \
|
git svn init --minimize-url -R svkmerge \
|
||||||
|
--rewrite-root=http://svn.example.org \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
"
|
"
|
||||||
|
@ -11,6 +11,7 @@ test_expect_success 'load svn dump' "
|
|||||||
svnadmin load -q '$rawsvnrepo' \
|
svnadmin load -q '$rawsvnrepo' \
|
||||||
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
|
||||||
git svn init --minimize-url -R svnmerge \
|
git svn init --minimize-url -R svnmerge \
|
||||||
|
--rewrite-root=http://svn.example.org \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
"
|
"
|
||||||
|
Reference in New Issue
Block a user