From: Steven Walter <stevenrwalter@gmail.com>
To: gitster@pobox.com, normalperson@yhbt.net, git@vger.kernel.org,
andersk@mit.edu
Cc: Steven Walter <stevenrwalter@gmail.com>
Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5
Date: Fri, 22 Oct 2010 21:55:58 -0400 [thread overview]
Message-ID: <1287798958-22549-1-git-send-email-stevenrwalter@gmail.com> (raw)
In-Reply-To: <1287737937.3785.15.camel@balanced-tree>
Specify a revision range to "merge" and manually set the svn:mergeinfo
property.
---
t/t9157-git-svn-fetch-merge.sh | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index da582c5..424e1fa 100755
--- a/t/t9157-git-svn-fetch-merge.sh
+++ b/t/t9157-git-svn-fetch-merge.sh
@@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' '
svn add baz &&
svn commit -m x &&
svn switch "$svnrepo"/trunk &&
- svn merge "$svnrepo"/branches/branch1 &&
+ svn merge -r3:7 "$svnrepo"/branches/branch1 &&
+ svn propset svn:mergeinfo "/branches/branch1:4-7" . &&
svn commit -m "merge" &&
svn switch "$svnrepo"/branches/branch1 &&
svn commit -m x &&
svn switch "$svnrepo"/branches/branch2 &&
- svn merge "$svnrepo"/branches/branch1 &&
+ svn merge -r3:8 "$svnrepo"/branches/branch1 &&
+ svn propset svn:mergeinfo "/branches/branch1:4-8" . &&
svn commit -m "merge branch1" &&
svn switch "$svnrepo"/trunk &&
- svn merge "$svnrepo"/branches/branch2 &&
+ svn merge -r5:9 "$svnrepo"/branches/branch2 &&
+ svn propset svn:mergeinfo "/branches/branch1:4-8
+/branches/branch2:6-9" . &&
svn resolved baz &&
svn commit -m "merge branch2"
) &&
--
1.6.3.3
next prev parent reply other threads:[~2010-10-23 1:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 4:13 [ANNOUNCE] Git 1.7.3.2 Junio C Hamano
2010-10-22 8:58 ` Test failure with old svn [Re: [ANNOUNCE] Git 1.7.3.2] Anders Kaseorg
2010-10-23 1:55 ` Steven Walter [this message]
2010-11-18 21:15 ` [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Anders Kaseorg
2010-11-18 23:35 ` Anders Kaseorg
2010-11-25 23:39 ` Eric Wong
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=1287798958-22549-1-git-send-email-stevenrwalter@gmail.com \
--to=stevenrwalter@gmail.com \
--cc=andersk@mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.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).