Subject: t9010 broken in pu [Re: What's cooking in git.git (Dec 2010, #01; Sat, 4)]

From: Thomas Rast <[email-masked]>
Date: Wed, 8 Dec 2010 12:23:47 +0100

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