From: Tuomas Suutari Date: Wed, 24 Feb 2010 18:09:02 GMT Subject: [PATCH 2/2] t9150,t9151: Add rewrite-root option to init Message-ID: <1267034942-31581-2-git-send-email-tuomas.suutari@gmail.com> In-Reply-To: <1267034942-31581-1-git-send-email-tuomas.suutari@gmail.com> 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 --- This is mainly for supporting the first patch. Try applying this before the first patch to see the problem it addresses. After this is applied, then there are no merge detecting tests without rewrite-root. Could this be a problem? t/t9150-svk-mergetickets.sh | 1 + t/t9151-svn-mergeinfo.sh | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh index 5358142..24c2421 100755 --- a/t/t9150-svk-mergetickets.sh +++ b/t/t9150-svk-mergetickets.sh @@ -11,6 +11,7 @@ test_expect_success 'load svk depot' " svnadmin load -q '$rawsvnrepo' \ < '$TEST_DIRECTORY/t9150/svk-merge.dump' && git svn init --minimize-url -R svkmerge \ + --rewrite-root=http://svn.example.org \ -T trunk -b branches '$svnrepo' && git svn fetch --all " diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index 3569c62..c415775 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -11,6 +11,7 @@ test_expect_success 'load svn dump' " svnadmin load -q '$rawsvnrepo' \ < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' && git svn init --minimize-url -R svnmerge \ + --rewrite-root=http://svn.example.org \ -T trunk -b branches '$svnrepo' && git svn fetch --all " -- 1.7.0.2.ged48