{"thread":{"id":"23679","subject":"Migrating from subversion via git svn contains log entry, but not the file change in the branch.","startedAt":"2010-05-03T12:25:36Z","lastAt":"2010-05-04T15:57:35Z","messageCount":7,"participants":["magnuspalmer","Michael J Gruber","Dmitrijs Ledkovs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"140822","messageId":"1272889536578-4997493.post@n2.nabble.com","threadId":"23679","inReplyTo":null,"subject":"Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"magnuspalmer","fromEmail":"magnus.palmer@jayway.com","sentAt":"2010-05-03T12:25:36Z","receivedAt":"2010-05-03T12:25:36Z","isPatch":false,"sender":{"key":"magnus.palmer@jayway.com","avatar":null},"body":"\nI've been working almost fulltime for two weeks migrating a subversion\nrepository to git.\nMost repos go fine, but some doesn't and I'm running out of options.\n\nBeen trying to find posts regarding this and tried what I've found.\n\nThe subversion repo contains subrepos.\nLayout is this:\ntags\nbranches\n<trunk is in root dir, contains only a maven pom.xml>\nsubrepo-a(with standard layout: trunk, tags, branches)\nsubrepo-n\n\nTeam is doing ongoing development in currently four branches (develop,\nrelease-product-a-1.1, release-product-b-1.0, trunk). I'll deal with that\nlater.\n\nWhat happends is that I get the svn log message, but the file is not the\ncorrect one, or the file is completely missing suddenly.\ngit checkout develop\nHEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT.\n\nThe change in the file is not there, the old version number in the pom.xml.\nI compare this with the one checkout out via svn.\n\ngit svn init --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n--ignore-paths=\"branches|tags|subrepo-a|subrepo-b|\"\nhttps://example.com/svn/theproject/client\n\nThen I've tried:\ngit fetch\ngit fetch --no-follow-parent\nturn on/off brokensymlink workaround\ngit config svn.brokenSymlinkWorkaround false\ngit config svn.brokenSymlinkWorkaround true\n\nAlso started at different revisions\n-r XYZ:HEAD\n\nFor one of the cases (with svn.brokenSymlinkWorkaround=false) I get:\nFound possible branch point:\nhttps://example.com/svn/theproject/client/branches/develop/pom.xml =>\nhttps://example.com/svn/theproject/client/branches/release-1.1.0, 10623\nInitializing parent: release-1.1.0@10623\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 6973, path\n'/theproject/client/branches/develop/pom.xml'\n\nAnd I end up with a:\nremotes/release-1.1.0\nremotes/release-1.1.0@10623\n\nAny ideas of how to proceed?\nI am getting short out of ideas.\n\n/Magnus Palmér\n\n\n\n/Magnus Palmér\n-- \nView 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-tp4997493p4997493.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"140823","messageId":"4BDEC3AE.90409@drmicha.warpmail.net","threadId":"23679","inReplyTo":"1272889536578-4997493.post@n2.nabble.com","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-05-03T12:38:06Z","receivedAt":"2010-05-03T12:38:06Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"magnuspalmer venit, vidit, dixit 03.05.2010 14:25:\n> \n> I've been working almost fulltime for two weeks migrating a subversion\n> repository to git.\n> Most repos go fine, but some doesn't and I'm running out of options.\n> \n> Been trying to find posts regarding this and tried what I've found.\n> \n> The subversion repo contains subrepos.\n> Layout is this:\n> tags\n> branches\n> <trunk is in root dir, contains only a maven pom.xml>\n> subrepo-a(with standard layout: trunk, tags, branches)\n> subrepo-n\n> \n> Team is doing ongoing development in currently four branches (develop,\n> release-product-a-1.1, release-product-b-1.0, trunk). I'll deal with that\n> later.\n> \n> What happends is that I get the svn log message, but the file is not the\n> correct one, or the file is completely missing suddenly.\n> git checkout develop\n> HEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT.\n> \n> The change in the file is not there, the old version number in the pom.xml.\n> I compare this with the one checkout out via svn.\n> \n> git svn init --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n\nWhat is the reason for the tags/*/*? I would expect a simple --tags=tags\nhere.\n\n> --ignore-paths=\"branches|tags|subrepo-a|subrepo-b|\"\n> https://example.com/svn/theproject/client\n> \n> Then I've tried:\n> git fetch\n> git fetch --no-follow-parent\n\ngit svn that, I assume.\n\n> turn on/off brokensymlink workaround\n> git config svn.brokenSymlinkWorkaround false\n> git config svn.brokenSymlinkWorkaround true\n\nDo you use symlinks?\n\n> Also started at different revisions\n> -r XYZ:HEAD\n> \n> For one of the cases (with svn.brokenSymlinkWorkaround=false) I get:\n> Found possible branch point:\n> https://example.com/svn/theproject/client/branches/develop/pom.xml =>\n> https://example.com/svn/theproject/client/branches/release-1.1.0, 10623\n> Initializing parent: release-1.1.0@10623\n> W: Ignoring error from SVN, path probably does not exist: (160013):\n> Filesystem has no item: File not found: revision 6973, path\n> '/theproject/client/branches/develop/pom.xml'\n> \n> And I end up with a:\n> remotes/release-1.1.0\n> remotes/release-1.1.0@10623\n> \n> Any ideas of how to proceed?\n> I am getting short out of ideas.\n\nI assume you can't make that repo accessible, can you?\n\nMichael\n"},{"id":"140827","messageId":"p2g86ecb3c71005030552odafaa805ob43f7f0c8a9be0b8@mail.gmail.com","threadId":"23679","inReplyTo":"4BDEC3AE.90409@drmicha.warpmail.net","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"Dmitrijs Ledkovs","fromEmail":"dmitrij.ledkov@ubuntu.com","sentAt":"2010-05-03T12:52:41Z","receivedAt":"2010-05-03T12:52:41Z","isPatch":false,"sender":{"key":"dmitrij.ledkov@ubuntu.com","avatar":"https://gravatar.com/avatar/79b618c6eb391ddb486c2ee0d3b429014e0e9ba579fd55f2e035f482fc8c24f4?d=mp&s=160"},"body":"On 3 May 2010 13:38, Michael J Gruber <git@drmicha.warpmail.net> wrote:\n> magnuspalmer venit, vidit, dixit 03.05.2010 14:25:\n>>\n>> I've been working almost fulltime for two weeks migrating a subversion\n>> repository to git.\n>> Most repos go fine, but some doesn't and I'm running out of options.\n>>\n>> Been trying to find posts regarding this and tried what I've found.\n>>\n>> The subversion repo contains subrepos.\n>> Layout is this:\n>> tags\n>> branches\n>> <trunk is in root dir, contains only a maven pom.xml>\n>> subrepo-a(with standard layout: trunk, tags, branches)\n>> subrepo-n\n>>\n>> Team is doing ongoing development in currently four branches (develop,\n>> release-product-a-1.1, release-product-b-1.0, trunk). I'll deal with that\n>> later.\n>>\n>> What happends is that I get the svn log message, but the file is not the\n>> correct one, or the file is completely missing suddenly.\n>> git checkout develop\n>> HEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT.\n>>\n>> The change in the file is not there, the old version number in the pom.xml.\n>> I compare this with the one checkout out via svn.\n>>\n>> git svn init --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n>\n\nI've actually just edited .git/config and then did git svn init URL.\nFound this easier for complex layouts, cause then you can control\neverything that is happening.\n\n[svn-remote \"svn\"]\n        url = http://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64\n        fetch = trunk:refs/remotes/trunk\n        branches = {experimental,web}:refs/remotes/*\n        tags = branches/releases/*:refs/remotes/releases/*\n        fetch = :refs/remotes/git-svn\n"},{"id":"140826","messageId":"1272891180297-4997630.post@n2.nabble.com","threadId":"23679","inReplyTo":"4BDEC3AE.90409@drmicha.warpmail.net","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"magnuspalmer","fromEmail":"magnus.palmer@jayway.com","sentAt":"2010-05-03T12:53:00Z","receivedAt":"2010-05-03T12:53:00Z","isPatch":false,"sender":{"key":"magnus.palmer@jayway.com","avatar":null},"body":"\nAnswer to list failed, so typing it in forum instead.\n\n\nMichael J Gruber-2 wrote:\n> \n> magnuspalmer venit, vidit, dixit 03.05.2010 14:25:\n>> \n>> I've been working almost fulltime for two weeks migrating a subversion\n>> repository to git.\n>> Most repos go fine, but some doesn't and I'm running out of options.\n>> \n>> Been trying to find posts regarding this and tried what I've found.\n>> \n>> The subversion repo contains subrepos.\n>> Layout is this:\n>> tags\n>> branches\n>> <trunk is in root dir, contains only a maven pom.xml>\n>> subrepo-a(with standard layout: trunk, tags, branches)\n>> subrepo-n\n>> \n>> Team is doing ongoing development in currently four branches (develop,\n>> release-product-a-1.1, release-product-b-1.0, trunk). I'll deal with that\n>> later.\n>> \n>> What happends is that I get the svn log message, but the file is not the\n>> correct one, or the file is completely missing suddenly.\n>> git checkout develop\n>> HEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT.\n>> \n>> The change in the file is not there, the old version number in the\n>> pom.xml.\n>> I compare this with the one checkout out via svn.\n>> \n>> git svn init --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n> \n> What is the reason for the tags/*/*? I would expect a simple --tags=tags\n> here.\n> \n>>> they have for some reason tags/internal-delivery and tags/delivery\n> \n>> --ignore-paths=\"branches|tags|subrepo-a|subrepo-b|\"\n>> https://example.com/svn/theproject/client\n>> \n>> Then I've tried:\n>> git fetch\n>> git fetch --no-follow-parent\n> \n> git svn that, I assume.\n> \n>>> Yes, it is git svn of course. \n> \n>> turn on/off brokensymlink workaround\n>> git config svn.brokenSymlinkWorkaround false\n>> git config svn.brokenSymlinkWorkaround true\n> \n> Do you use symlinks?\n> \n>>> Don't know, I am off site the current team that will move to this\n>>> location.\n>>> Since they use windows workstations I doubt it.\n> \n>> Also started at different revisions\n>> -r XYZ:HEAD\n>> \n>> For one of the cases (with svn.brokenSymlinkWorkaround=false) I get:\n>> Found possible branch point:\n>> https://example.com/svn/theproject/client/branches/develop/pom.xml =>\n>> https://example.com/svn/theproject/client/branches/release-1.1.0, 10623\n>> Initializing parent: release-1.1.0@10623\n>> W: Ignoring error from SVN, path probably does not exist: (160013):\n>> Filesystem has no item: File not found: revision 6973, path\n>> '/theproject/client/branches/develop/pom.xml'\n>> \n>> And I end up with a:\n>> remotes/release-1.1.0\n>> remotes/release-1.1.0@10623\n>> \n>> Any ideas of how to proceed?\n>> I am getting short out of ideas.\n> \n> I assume you can't make that repo accessible, can you?\n> \n>>> No, unfortunately :(\n>>> It was hard getting access myself.\n>>> It is a team of consultants moving from offsite contracting to inhouse\n>>> development. Same team though.\n> \n> Michael\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n> \n\n-- \nView 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\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"140909","messageId":"1272986459810-5003868.post@n2.nabble.com","threadId":"23679","inReplyTo":"p2g86ecb3c71005030552odafaa805ob43f7f0c8a9be0b8@mail.gmail.com","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"magnuspalmer","fromEmail":"magnus.palmer@jayway.com","sentAt":"2010-05-04T15:20:59Z","receivedAt":"2010-05-04T15:20:59Z","isPatch":false,"sender":{"key":"magnus.palmer@jayway.com","avatar":null},"body":"\n\nDmitrijs Ledkovs-2 wrote:\n> \n> \n> I've actually just edited .git/config and then did git svn init URL.\n> Found this easier for complex layouts, cause then you can control\n> everything that is happening.\n> \n> [svn-remote \"svn\"]\n>         url = http://mingw-w64.svn.sourceforge.net/svnroot/mingw-w64\n>         fetch = trunk:refs/remotes/trunk\n>         branches = {experimental,web}:refs/remotes/*\n>         tags = branches/releases/*:refs/remotes/releases/*\n>         fetch = :refs/remotes/git-svn\n> \n> \n\nTried this, produced different result though, but not a successful one.\n-- \nView 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-tp4997493p5003868.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"140911","messageId":"1272987155533-5003911.post@n2.nabble.com","threadId":"23679","inReplyTo":"4BDEC3AE.90409@drmicha.warpmail.net","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"magnuspalmer","fromEmail":"magnus.palmer@jayway.com","sentAt":"2010-05-04T15:32:35Z","receivedAt":"2010-05-04T15:32:35Z","isPatch":false,"sender":{"key":"magnus.palmer@jayway.com","avatar":null},"body":"\nOk, I have a local copy of the Subversion repo not using svnsync to speed up\ntesting.\n\nI also upgraded git and git-svn to 1.7.1\nSvn is at 1.6.5\n\nI do the git svn init as before, but with the\nfile://<path_to_local_svn_repo>\nIt is saying using higher level url, if that does anything?\n\nI asume that this error message is what is causing my problem?\n\nr10623 = 7191e343c78eb0705173c47b1f914da8b1c6d6f5 (refs/remotes/svn/trunk)\nFound possible branch point:\nfile:///home/user/svn-repo/services/project/clients/branches/develop/pom.xml\n=>\nfile:///home/user/svn-repo/services/project/clients/branches/release-1.1.0,\n10623\nInitializing parent: refs/remotes/svn/release-1.1.0@10623\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 101, path\n'/services/clients/branches/develop/pom.xml'\nW: Do not be alarmed at the above message git-svn is just searching\naggressively for old history.\nThis may take a while on large repositories\nr9529 = f4b81a737c453f18ab613cb216f26671e24b5d6e\n(refs/remotes/svn/release-1.1.0@10623)\nr9812 = 9359c6b9aac2c753e484d3a6ba26c857f578ad15\n(refs/remotes/svn/release-1.1.0@10623)\nFound branch parent: (refs/remotes/svn/release-1.1.0)\n9359c6b9aac2c753e484d3a6ba26c857f578ad15\nFollowing parent with do_switch\nInvalid filesystem path syntax: Cannot replace a directory from within at\n/usr/lib/git-core/git-svn line 5097\n\n\nBtw, why do I get a @<revision> branch here?\nremotes/svn/release-1.1.0\nremotes/svn/release-1.1.0@10623\n\n\ngit checkout -b develop svn/develop\nHEAD is now at 5012366... increased version to 1.2.0-SNAPSHOT\n\nVersion in file is not 1.2.0-SNAPSHOT as the log says and as it is in\nSubversion.\n\n\n-- \nView 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-tp4997493p5003911.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"140912","messageId":"1272988655082-5004035.post@n2.nabble.com","threadId":"23679","inReplyTo":"1272987155533-5003911.post@n2.nabble.com","subject":"Re: Migrating from subversion via git svn contains log entry, but not the file change in the branch.","fromName":"magnuspalmer","fromEmail":"magnus.palmer@jayway.com","sentAt":"2010-05-04T15:57:35Z","receivedAt":"2010-05-04T15:57:35Z","isPatch":false,"sender":{"key":"magnus.palmer@jayway.com","avatar":null},"body":"\nSorry for spamming, got it working with the following changes:\n\nIt turned out that removing the ignore paths entry for branches and tags did\nit the trick.\n\nPreviously:\ngit svn init -s --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n--ignore-paths=\"branches|tags|subrepo-a|subrepo-b|\" <repo_url>\n\n\"Working\"\ngit svn init -s --trunk='' --tags=tags/*/* --branches=branches --prefix=svn/\n--ignore-paths=\"subrepo-a|subrepo-b|\" <repo_url>\n\nI also had to change from --trunk='' to explicit\n--trunk='file:///home/repo/svn-repo/services/project/clients' or else it\nalso created the branches and tags dirs.\n \n-- \nView 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-tp4997493p5004035.html\nSent from the git mailing list archive at Nabble.com.\n"}]}