git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Mmagnuspalmer <magnus.palmer@jayway.com>
Date
May 3, 2010, 12:53 UTC
Message-ID
<1272891180297-4997630.post@n2.nabble.com>
In-Reply-To
<4BDEC3AE.90409@drmicha.warpmail.net>
Answer to list failed, so typing it in forum instead.
Michael J Gruber-2 wrote:
Show 91 quoted lines
> 
> 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.
> 
>>> they have for some reason tags/internal-delivery and tags/delivery
> 
>> --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.
> 
>>> Yes, it is git svn of course. 
> 
>> turn on/off brokensymlink workaround
>> git config svn.brokenSymlinkWorkaround false
>> git config svn.brokenSymlinkWorkaround true
> 
> Do you use symlinks?
> 
>>> Don't know, I am off site the current team that will move to this
>>> location.
>>> Since they use windows workstations I doubt it.
> 
>> 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?
> 
>>> No, unfortunately :(
>>> It was hard getting access myself.
>>> It is a team of consultants moving from offsite contracting to inhouse
>>> development. Same team though.
> 
> Michael
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
-- 
View this message in context: http://git.661346.n2.nabble.com/Migrating-from-subversion-via-git-svn-contains-log-entry-but-not-the-file-change-in-the-branch-tp4997493p4997630.html
Sent from the git mailing list archive at Nabble.com.
Previous: magnuspalmerNext: magnuspalmer
Message 5 of 7 in “Migrating from subversion via git svn contains log entry, but not the file change in the branch.”
  1. magnuspalmerMay 3, 2010
  2. Michael J GruberMay 3, 2010
  3. Dmitrijs LedkovsMay 3, 2010
  4. magnuspalmerMay 4, 2010
  5. magnuspalmerMay 3, 2010
  6. magnuspalmerMay 4, 2010
  7. magnuspalmerMay 4, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.