On 3 May 2010 13:38, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote:
> magnuspalmer venit, vidit, dixit 03.05.2010 14:25:
>>
>> 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/
>
I've actually just edited .git/config and then did git svn init URL.
Found this easier for complex layouts, cause then you can control
everything that is happening.
[svn-remote "svn"]
url = http://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64
fetch = trunk:refs/remotes/trunk
branches = {experimental,web}:refs/remotes/*
tags = branches/releases/*:refs/remotes/releases/*
fetch = :refs/remotes/git-svn
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html