From: Anders Kaseorg <andersk@MIT.EDU>
To: Junio C Hamano <gitster@pobox.com>
Cc: Steven Walter <swalter@lpdev.prtdev.lexmark.com>,
Eric Wong <normalperson@yhbt.net>,
git@vger.kernel.org
Subject: Test failure with old svn [Re: [ANNOUNCE] Git 1.7.3.2]
Date: Fri, 22 Oct 2010 04:58:57 -0400 [thread overview]
Message-ID: <1287737937.3785.15.camel@balanced-tree> (raw)
In-Reply-To: <7vwrparhjq.fsf@alter.siamese.dyndns.org>
On Thu, 2010-10-21 at 21:13 -0700, Junio C Hamano wrote:
> Steven Walter (1):
> git-svn: check_cherry_pick should exclude commits already in our history
The new test in this commit fails with Subversion 1.4 and below (for
example, on Ubuntu 6.06 and 8.04), where ‘svn merge’ required at least
two arguments. I’m guessing that with Subversion < 1.5, the test
doesn’t make sense and should just be skipped.
Anders
*** t9157-git-svn-fetch-merge.sh ***
Initialized empty Git repository in /build/buildd/git-1.7.3.2/t/trash directory.t9157-git-svn-fetch-merge/.git/
expecting success:
svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd mkdir -m x "$svnrepo"/branches &&
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
(
cd "$SVN_TREE" &&
touch foo &&
svn add foo &&
svn commit -m "initial commit" &&
svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
touch bar &&
svn add bar &&
svn commit -m x &&
svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
svn switch "$svnrepo"/branches/branch1 &&
touch baz &&
svn add baz &&
svn commit -m x &&
svn switch "$svnrepo"/trunk &&
svn merge "$svnrepo"/branches/branch1 &&
svn commit -m "merge" &&
svn switch "$svnrepo"/branches/branch1 &&
svn commit -m x &&
svn switch "$svnrepo"/branches/branch2 &&
svn merge "$svnrepo"/branches/branch1 &&
svn commit -m "merge branch1" &&
svn switch "$svnrepo"/trunk &&
svn merge "$svnrepo"/branches/branch2 &&
svn resolved baz &&
svn commit -m "merge branch2"
) &&
rm -rf "$SVN_TREE"
rm -rf "$SVN_TREE"
Committed revision 1.
Committed revision 2.
Checked out revision 2.
A foo
Adding foo
Transmitting file data .
Committed revision 3.
Committed revision 4.
A bar
Adding bar
Transmitting file data .
Committed revision 5.
Committed revision 6.
D bar
Updated to revision 6.
A baz
Adding baz
Transmitting file data .
Committed revision 7.
D baz
A bar
Updated to revision 7.
svn: Not enough arguments provided; try 'svn help' for more info
not ok - 1 initialize source svn repo
next prev parent reply other threads:[~2010-10-22 8:59 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 ` Anders Kaseorg [this message]
2010-10-23 1:55 ` [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Steven Walter
2010-11-18 21:15 ` 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=1287737937.3785.15.camel@balanced-tree \
--to=andersk@mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
--cc=swalter@lpdev.prtdev.lexmark.com \
/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).