From: Michael J Gruber <git@drmicha.warpmail.net>
To: magnuspalmer <magnus.palmer@jayway.com>
Cc: 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, 03 May 2010 14:38:06 +0200 [thread overview]
Message-ID: <4BDEC3AE.90409@drmicha.warpmail.net> (raw)
In-Reply-To: <1272889536578-4997493.post@n2.nabble.com>
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/
What is the reason for the tags/*/*? I would expect a simple --tags=tags
here.
> --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?
> 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
next prev parent reply other threads:[~2010-05-03 12:38 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 [this message]
2010-05-03 12:52 ` Dmitrijs Ledkovs
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=4BDEC3AE.90409@drmicha.warpmail.net \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.