From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>, Jonathan Nieder <jrnieder@gmail.com>
Subject: t9010 broken in pu [Re: What's cooking in git.git (Dec 2010, #01; Sat, 4)]
Date: Wed, 8 Dec 2010 12:23:47 +0100 [thread overview]
Message-ID: <201012081223.47642.trast@student.ethz.ch> (raw)
In-Reply-To: <7voc90wx36.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> * jn/svn-fe (2010-11-19) 17 commits
> - vcs-svn: Implement Prop-delta handling
> - vcs-svn: Sharpen parsing of property lines
> - vcs-svn: Split off function for handling of individual properties
> - vcs-svn: Make source easier to read on small screens
> - vcs-svn: More dump format sanity checks
> - vcs-svn: Reject path nodes without Node-action
> - vcs-svn: Delay read of per-path properties
> - vcs-svn: Combine repo_replace and repo_modify functions
> - vcs-svn: Replace = Delete + Add
> - vcs-svn: handle_node: Handle deletion case early
> - vcs-svn: Use mark to indicate nodes with included text
> - vcs-svn: Unclutter handle_node by introducing have_props var
> - vcs-svn: Eliminate node_ctx.mark global
> - vcs-svn: Eliminate node_ctx.srcRev global
> - vcs-svn: Check for errors from open()
> - vcs-svn: Allow simple v3 dumps (no deltas yet)
> - vcs-svn: Error out for v3 dumps
>
> Some RFC patches, to give them early and wider exposure.
If I'm reading the test report right, the merge conflict in
t/t9010-svn-fe.sh broke tests. It bisects to 5ea8b68 (Merge branch
'jn/svn-fe' into pu, 2010-12-07), failing with
expecting success:
svnadmin create simple-svn &&
svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
git init simple-git &&
test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
(
cd simple-git &&
git fast-import <../simple.fe
) &&
(
cd simple-svnco &&
git init &&
git add . &&
git fetch ../simple-git master &&
git diff --exit-code FETCH_HEAD
)
svnadmin: Repository creation failed
svnadmin: Could not create top-level directory
svnadmin: 'simple-svn' exists and is non-empty
not ok - 18 t9135/svn.dump
A quick reading of the merge suggests that you concatenated with an
earlier test that goes
test_dump () {
label=$1
dump=$2
test_expect_success "$dump" '
svnadmin create "$label-svn" &&
# <snip>
'
}
test_dump simple t9135/svn.dump
hence creating simple-svn, too. So a rename or rm -rf should suffice.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-12-08 11:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-05 6:30 What's cooking in git.git (Dec 2010, #01; Sat, 4) Junio C Hamano
2010-12-05 7:39 ` Jeff King
2010-12-05 19:54 ` Junio C Hamano
2010-12-06 0:54 ` aleksi.aalto
2010-12-09 17:27 ` Jeff King
2010-12-10 19:55 ` Junio C Hamano
2010-12-05 10:13 ` Yann Dirson
2010-12-05 20:23 ` Junio C Hamano
2010-12-06 7:29 ` Yann Dirson
2010-12-06 8:13 ` Miles Bader
2010-12-06 8:21 ` Yann Dirson
2010-12-06 8:39 ` Miles Bader
2010-12-06 8:48 ` Yann Dirson
2010-12-06 9:13 ` Miles Bader
2010-12-06 11:31 ` Yann Dirson
2010-12-06 11:37 ` Matthieu Moy
2010-12-10 21:59 ` Junio C Hamano
2010-12-05 12:36 ` aleksi.aalto
2010-12-05 15:51 ` Patrick Rouleau
2010-12-05 13:00 ` Erik Faye-Lund
2010-12-05 20:15 ` Junio C Hamano
2010-12-05 15:00 ` Michael J Gruber
2010-12-05 20:06 ` Junio C Hamano
2010-12-06 8:55 ` Michael J Gruber
2010-12-06 15:39 ` Thiago Farina
2010-12-08 11:23 ` Thomas Rast [this message]
2010-12-08 11:28 ` t9010 broken in pu [Re: What's cooking in git.git (Dec 2010, #01; Sat, 4)] Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201012081223.47642.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).