diff options
| author | Eric Wong <normalperson@yhbt.net> | 2009-02-23 04:25:00 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2009-02-23 04:31:08 (GMT) |
| commit | 83c2fcff214fe89649fcd88e095d9961a36b53dd (patch) | |
| tree | 4bfb65b669ae5d87d1b08b2a193835366f134673 /t/t9136-git-svn-recreated-branch-empty-file.sh | |
| parent | 7d9fd459f1f5064b421837e46fe87118a07f6d6c (diff) | |
| download | git-83c2fcff214fe89649fcd88e095d9961a36b53dd.zip git-83c2fcff214fe89649fcd88e095d9961a36b53dd.tar.gz git-83c2fcff214fe89649fcd88e095d9961a36b53dd.tar.bz2 | |
git-svn: fix delete+add branch tracking with empty files
Original bug report and test case by Björn Steinbrink.
Björn Steinbrink <B.Steinbrink@gmx.de> wrote:
> Hi Eric,
>
> seems that the empty symlink stuff gets confused about which revision to
> use when looking for the parent's file.
>
> r3 = f1a6fcf6b0a1c4a373d0b2b65a3d70700084f361 (tags/1.0.1)
> Found possible branch point: file:///home/doener/h/svn/tags/1.0 => file:///home/doener/h/svn/branches/1.0, 4
> Found branch parent: (1.0) 63ae640ba01014ecbb3df590999ed1fa5914545b
> Following parent with do_switch
> Successfully followed parent
> r5 = 26fcfef5bcced97ab74faf1af7341a2ae0d272aa (1.0)
> Found possible branch point: file:///home/doener/h/svn/branches/1.0 => file:///home/doener/h/svn/tags/1.0.1, 5
> Found branch parent: (tags/1.0.1) 26fcfef5bcced97ab74faf1af7341a2ae0d272aa
> Following parent with do_switch
> Scanning for empty symlinks, this may take a while if you have many empty files
> You may disable this with `git config svn.brokenSymlinkWorkaround false'.
> This may be done in a different terminal without restarting git svn
> Filesystem has no item: File not found: revision 3, path '/branches/1.0/file' at /usr/local/libexec/git-core/git-svn line 3318
>
> Note how it tries to look at revision 3 instead of revision 5 (which it
> correctly detected as the parent). The import succeeds when
> svn.brokenSymlinkWorkaround is set to false. Testcase below.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9136-git-svn-recreated-branch-empty-file.sh')
| -rwxr-xr-x | t/t9136-git-svn-recreated-branch-empty-file.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t9136-git-svn-recreated-branch-empty-file.sh b/t/t9136-git-svn-recreated-branch-empty-file.sh new file mode 100755 index 0000000..733d16e --- /dev/null +++ b/t/t9136-git-svn-recreated-branch-empty-file.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +test_description='test recreated svn branch with empty files' + +. ./lib-git-svn.sh +test_expect_success 'load svn dumpfile' ' + svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9136/svn.dump" + ' + +test_expect_success 'clone using git svn' 'git svn clone -s "$svnrepo" x' + +test_done |