Re: git-svnimport breakage as of git-1.4.4
- From
- Sasha Khapyorsky <sashak@voltaire.com>
- Date
- Dec 11, 2006, 20:49 UTC
- Message-ID
- <20061211204904.GC1003@sashak.voltaire.com>
- In-Reply-To
- <1165847230.13854.2.camel@systems03.lan.brontes3d.com>
On 09:27 Mon 11 Dec , Daniel Drake wrote:
Show 15 quoted lines
> On Fri, 2006-12-08 at 22:32 +0200, Sasha Khapyorsky wrote:
> > > # git-svnimport -v -i -C repo -r https://server repo
> >
> > Is this 'server' public? Can I rerun this git-svnimport?
>
> Sorry, it is not.
>
> > @@ -906,7 +912,7 @@ sub commit_all {
> > my ($changed_paths, $revision, $author, $date, $message, $pool) = @_;
> > my %p;
> > while(my($path,$action) = each %$changed_paths) {
> > - $p{$path} = [ $action->action,$action->copyfrom_path, $action->copyfrom_rev, $path ];
> > + $p{$path} = [ $action->action,$svn_dir$action->copyfrom_path, $action->copyfrom_rev, $svn_dir$path ];
>
> This is not valid perl - I think you wanted $svn_dir . $pathYes, sorry.
Show 13 quoted lines
> > After making that modification it's not fixed though: > > Fetching from 1 to 10742 ... > Tree ID 4b825dc642cb6eb9a060e54bf8d69288fbee4904 > Committed change 1:/ 2004-12-22 22:53:27) > Committing initial tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904 > Commit ID 2614c05ac4c5f24eb89cea056a7d46c909084d8c > Writing to refs/heads/origin > DONE: 1 origin 2614c05ac4c5f24eb89cea056a7d46c909084d8c > perl: subversion/libsvn_subr/path.c:377: svn_path_basename: Assertion > `is_canonical (path, len)' failed. > Aborted
Maybe I'm starting to understand. Your svn url (url which points to svn repository) is https://server/repo and not just https://server, right?
If so, please remove the patch (you don't need it) and rerun:
git-svnimport -v -i -C repo -r https://server/repo