From: "David D. Kilzer" <ddkilzer@kilzer.net>
To: git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>,
"David D. Kilzer" <ddkilzer@kilzer.net>
Subject: [BUG/TEST] git-svn: fetch fails with deleted tag
Date: Fri, 6 Aug 2010 22:36:55 -0700 [thread overview]
Message-ID: <1281159415-60900-1-git-send-email-ddkilzer@kilzer.net> (raw)
The attached test fails when fetching the svn repo:
Checksum mismatch: ChangeLog 065854....
expected: ce771b....
got: 9563fd....
The issue seems to be that the tag was created, deleted and then
recreated from the same source revision but at different paths.
Any suggestions for how to work around or fix this would be
greatly appreciated.
Ironically, I made the original commits in the svn repo that I'm
trying to fetch. And yes, the extra "trunk" directory on the
branch was intended--it's the style that was agreed upon at the
time.
Signed-off-by: David D. Kilzer <ddkilzer@kilzer.net>
---
t/t9199-git-svn-deleted-tag.sh | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
create mode 100755 t/t9199-git-svn-deleted-tag.sh
diff --git a/t/t9199-git-svn-deleted-tag.sh b/t/t9199-git-svn-deleted-tag.sh
new file mode 100755
index 0000000..059cccd
--- /dev/null
+++ b/t/t9199-git-svn-deleted-tag.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+test_description='git svn fetch with deleted tag'
+
+. ./lib-git-svn.sh
+
+test_expect_success 'setup svn repo' '
+ mkdir -p import/trunk/SubDir &&
+ mkdir -p import/branches &&
+ mkdir -p import/tags &&
+ echo "base" > import/trunk/SubDir/ChangeLog &&
+ svn_cmd import -m "import for git svn" import "$svnrepo" &&
+ rm -rf import &&
+
+ svn_cmd mkdir --parents -m "create MyBranch directory" "$svnrepo/branches/MyBranch" &&
+ svn_cmd cp -m "create branch MyBranch" "$svnrepo/trunk" "$svnrepo/branches/MyBranch/trunk" &&
+
+ svn_cmd co "$svnrepo/trunk" svn_project &&
+ cd svn_project &&
+
+ echo "trunk change" >> SubDir/ChangeLog &&
+ svn_cmd ci -m "trunk change" SubDir/ChangeLog &&
+
+ svn_cmd switch "$svnrepo/branches/MyBranch/trunk" &&
+ echo "branch change" >> SubDir/ChangeLog &&
+ svn_cmd ci -m "branch change" SubDir/ChangeLog &&
+
+ cd .. &&
+ svn_cmd cp -m "create MyTag attempt 1" -r5 "$svnrepo/trunk/SubDir" "$svnrepo/tags/MyTag" &&
+ svn_cmd rm -m "delete MyTag attempt 1" "$svnrepo/tags/MyTag" &&
+ svn_cmd cp -m "create MyTag attempt 2" -r5 "$svnrepo/branches/MyBranch/trunk/SubDir" "$svnrepo/tags/MyTag"
+'
+
+test_expect_success 'fetch with deleted tag' '
+ git svn init --stdlayout "$svnrepo" git_project &&
+ cd git_project &&
+ git svn fetch
+'
+
+test_done
--
1.7.2.1.49.g98551
next reply other threads:[~2010-08-07 5:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-07 5:36 David D. Kilzer [this message]
2010-08-12 5:18 ` [BUG/TEST] git-svn: fetch fails with deleted tag David D. Kilzer
2010-08-12 8:11 ` 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=1281159415-60900-1-git-send-email-ddkilzer@kilzer.net \
--to=ddkilzer@kilzer.net \
--cc=git@vger.kernel.org \
--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).