Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: May 3, 2010, 12:38 UTC
Message-ID: <4BDEC3AE.90409@drmicha.warpmail.net>
In-Reply-To: <1272889536578-4997493.post@n2.nabble.com>

magnuspalmer venit, vidit, dixit 03.05.2010 14:25:

Show 28 quoted lines

> 
> I've been working almost fulltime for two weeks migrating a subversion
> repository to git.
> Most repos go fine, but some doesn't and I'm running out of options.
> 
> Been trying to find posts regarding this and tried what I've found.
> 
> The subversion repo contains subrepos.
> Layout is this:
> tags
> branches
> <trunk is in root dir, contains only a maven pom.xml>
> subrepo-a(with standard layout: trunk, tags, branches)
> subrepo-n
> 
> Team is doing ongoing development in currently four branches (develop,
> release-product-a-1.1, release-product-b-1.0, trunk). I'll deal with that
> later.
> 
> What happends is that I get the svn log message, but the file is not the
> correct one, or the file is completely missing suddenly.
> git checkout develop
> HEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT.
> 
> The change in the file is not there, the old version number in the pom.xml.
> I compare this with the one checkout out via svn.
> 
> git svn init --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/

What is the reason for the tags/*/*? I would expect a simple --tags=tags here.

Show 6 quoted lines

> --ignore-paths="branches|tags|subrepo-a|subrepo-b|"
> https://example.com/svn/theproject/client
> 
> Then I've tried:
> git fetch
> git fetch --no-follow-parent

git svn that, I assume.

> turn on/off brokensymlink workaround
> git config svn.brokenSymlinkWorkaround false
> git config svn.brokenSymlinkWorkaround true

Do you use symlinks?

Show 18 quoted lines

> Also started at different revisions
> -r XYZ:HEAD
> 
> For one of the cases (with svn.brokenSymlinkWorkaround=false) I get:
> Found possible branch point:
> https://example.com/svn/theproject/client/branches/develop/pom.xml =>
> https://example.com/svn/theproject/client/branches/release-1.1.0, 10623
> Initializing parent: release-1.1.0@10623
> W: Ignoring error from SVN, path probably does not exist: (160013):
> Filesystem has no item: File not found: revision 6973, path
> '/theproject/client/branches/develop/pom.xml'
> 
> And I end up with a:
> remotes/release-1.1.0
> remotes/release-1.1.0@10623
> 
> Any ideas of how to proceed?
> I am getting short out of ideas.

I assume you can't make that repo accessible, can you?

Michael