From: Tuomas Suutari <tuomas.suutari@gmail.com>
To: git@vger.kernel.org
Cc: Tuomas Suutari <tuomas.suutari@gmail.com>,
Sam Vilain <sam@vilain.net>, Eric Wong <normalperson@yhbt.net>
Subject: [PATCH 2/2] t9150,t9151: Add rewrite-root option to init
Date: Wed, 24 Feb 2010 20:09:02 +0200 [thread overview]
Message-ID: <1267034942-31581-2-git-send-email-tuomas.suutari@gmail.com> (raw)
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 <tuomas.suutari@gmail.com>
---
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
next prev parent reply other threads:[~2010-02-24 18:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 18:09 [PATCH 1/2] git-svn: Fix merge detecting with rewrite-root Tuomas Suutari
2010-02-24 18:09 ` Tuomas Suutari [this message]
2010-02-26 9:43 ` Eric Wong
2010-03-13 6:54 ` Tuomas Suutari
2010-03-13 8:44 ` Sam Vilain
2010-03-13 9:43 ` Eric Wong
2010-03-13 20:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1267034942-31581-2-git-send-email-tuomas.suutari@gmail.com \
--to=tuomas.suutari@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=sam@vilain.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).