From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: magnuspalmer <magnus.palmer@jayway.com>, git@vger.kernel.org
Subject: Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.
Date: Mon, 3 May 2010 13:52:41 +0100 [thread overview]
Message-ID: <p2g86ecb3c71005030552odafaa805ob43f7f0c8a9be0b8@mail.gmail.com> (raw)
In-Reply-To: <4BDEC3AE.90409@drmicha.warpmail.net>
On 3 May 2010 13:38, Michael J Gruber <git@drmicha.warpmail.net> 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
next prev parent reply other threads:[~2010-05-03 12:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 12:25 Migrating from subversion via git svn contains log entry, but not the file change in the branch magnuspalmer
2010-05-03 12:38 ` Michael J Gruber
2010-05-03 12:52 ` Dmitrijs Ledkovs [this message]
2010-05-04 15:20 ` magnuspalmer
2010-05-03 12:53 ` magnuspalmer
2010-05-04 15:32 ` magnuspalmer
2010-05-04 15:57 ` magnuspalmer
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=p2g86ecb3c71005030552odafaa805ob43f7f0c8a9be0b8@mail.gmail.com \
--to=dmitrij.ledkov@ubuntu.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=magnus.palmer@jayway.com \
/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).