{"thread":{"id":"15810","subject":"Different svn-id URLs in history","startedAt":"2008-10-07T10:58:41Z","lastAt":"2008-10-10T08:56:32Z","messageCount":9,"participants":["Knut Eldhuset","Michael J Gruber"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"92510","messageId":"48EB40E1.40506@3d-radar.com","threadId":"15810","inReplyTo":null,"subject":"Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-07T10:58:41Z","receivedAt":"2008-10-07T10:58:41Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Hi,\n\nAfter cloning my svn repository, I notice that the svn-id URL is \ndifferent when going back in history:\n\ngit-svn-id: https://server/trunk@300\n\nvs\n\ngit-svn-id: https://server/trunk/some_folder/project/src@250\n\nIf i checkout the first version, I get a working copy that has the \nfolder \"some_folder\" in it. If I checkout the latter version, I get a \nworking copy with the contents of the folder \"src\". Why is this? I \nthought I always was supposed to get a wc with the whole tree.\n\nRegards,\nKnut Eldhuset\n"},{"id":"92535","messageId":"48EB79D8.6090908@drmicha.warpmail.net","threadId":"15810","inReplyTo":"48EB40E1.40506@3d-radar.com","subject":"Re: Different svn-id URLs in history","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2008-10-07T15:01:44Z","receivedAt":"2008-10-07T15:01:44Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n> Hi,\n> \n> After cloning my svn repository, I notice that the svn-id URL is \n> different when going back in history:\n> \n> git-svn-id: https://server/trunk@300\n> \n> vs\n> \n> git-svn-id: https://server/trunk/some_folder/project/src@250\n> \n> If i checkout the first version, I get a working copy that has the \n> folder \"some_folder\" in it. If I checkout the latter version, I get a \n> working copy with the contents of the folder \"src\". Why is this? I \n> thought I always was supposed to get a wc with the whole tree.\n> \n> Regards,\n> Knut Eldhuset\n\nI take this is as an invitation for guesswork (given the amount of\ndetails)...\n\nYou probably have commits which don't follow your usual svn repo layout\n(trunk/some_folder/project/src) but commit to trunk/ directly. The output of\n\nsvn log -v -r300 https://server/trunk@300\nsvn log -v -r250 https://server/trunk/some_folder/project/src@250\n\nshould give some clues.\n\nMichael\n"},{"id":"92584","messageId":"48EC546F.7060106@3d-radar.com","threadId":"15810","inReplyTo":"48EB79D8.6090908@drmicha.warpmail.net","subject":"Re: Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-08T06:34:23Z","receivedAt":"2008-10-08T06:34:23Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Michael J Gruber wrote:\n> Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n>> Hi,\n>>\n>> After cloning my svn repository, I notice that the svn-id URL is \n>> different when going back in history:\n>>\n>> git-svn-id: https://server/trunk@300\n>>\n>> vs\n>>\n>> git-svn-id: https://server/trunk/some_folder/project/src@250\n>>\n> \n> I take this is as an invitation for guesswork (given the amount of\n> details)...\n\nSorry about that... I'm confused.\n> \n> You probably have commits which don't follow your usual svn repo layout\n> (trunk/some_folder/project/src) but commit to trunk/ directly. The output of\n> \n> svn log -v -r300 https://server/trunk@300\n> svn log -v -r250 https://server/trunk/some_folder/project/src@250\n> \n> should give some clues.\n> \n\nSvn log shows that the same path has been modified in both cases. I see \nsomething strange in git, though. Our svn repository has about 6500 \ncommits, but git shows over 10.000. Further investigation shows that a \nlot of svn commits have two entries in git. Some branches off of trunk \ndo not start at r1, but off of a duplicate rNNNN. Could this be due to \nour unhealthy practice of creating branches off of subtrees in svn? By \nthis I mean create a branch off of \nhttps://server/trunk/some_folder/project/src instead of \nhttps://server/trunk. If so, what can be done to fix this?\n\nAs a sidenote, during git svn clone, I noticed that each time a new \nbranch or tag was discovered, the \"scanning\" started back at r1. Is this \nnormal? I would think the history before the branch was already \nimported. Of course, this could maybe be due to the bad branching \npractice described above.\n\nRegards,\nKnut\n"},{"id":"92606","messageId":"48EC7022.7030707@drmicha.warpmail.net","threadId":"15810","inReplyTo":"48EC546F.7060106@3d-radar.com","subject":"Re: Different svn-id URLs in history","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2008-10-08T08:32:34Z","receivedAt":"2008-10-08T08:32:34Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Knut Eldhuset venit, vidit, dixit 08.10.2008 08:34:\n> Michael J Gruber wrote:\n>> Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n>>> Hi,\n>>>\n>>> After cloning my svn repository, I notice that the svn-id URL is \n>>> different when going back in history:\n>>>\n>>> git-svn-id: https://server/trunk@300\n>>>\n>>> vs\n>>>\n>>> git-svn-id: https://server/trunk/some_folder/project/src@250\n>>>\n>> I take this is as an invitation for guesswork (given the amount of\n>> details)...\n> \n> Sorry about that... I'm confused.\n>> You probably have commits which don't follow your usual svn repo layout\n>> (trunk/some_folder/project/src) but commit to trunk/ directly. The output of\n>>\n>> svn log -v -r300 https://server/trunk@300\n>> svn log -v -r250 https://server/trunk/some_folder/project/src@250\n>>\n>> should give some clues.\n>>\n> \n> Svn log shows that the same path has been modified in both cases. I see \n\nDoes \"same path\" mean:\n- same relative to the above paths or\n- same absolute path?\n\n> something strange in git, though. Our svn repository has about 6500 \n> commits, but git shows over 10.000. Further investigation shows that a \n> lot of svn commits have two entries in git. Some branches off of trunk \n> do not start at r1, but off of a duplicate rNNNN. Could this be due to \n> our unhealthy practice of creating branches off of subtrees in svn? By \n> this I mean create a branch off of \n> https://server/trunk/some_folder/project/src instead of \n> https://server/trunk. If so, what can be done to fix this?\n> \n> As a sidenote, during git svn clone, I noticed that each time a new \n> branch or tag was discovered, the \"scanning\" started back at r1. Is this \n> normal? I would think the history before the branch was already \n> imported. Of course, this could maybe be due to the bad branching \n> practice described above.\n\nsvn is typically \"abused\" in the sense that one svn repo is used for\nseparate projects (your subtrees). git-svn can deal with non-standard\nrepo layouts.\n\nI assume you can't share the svn repo publically, can you?\nSo, in order to help you, we would need to know\n\n- the layout of your svn repo: where are trunk, branches and tags, how\ndid you create branches and tags in svn, are \"projects\" entirely separate\n- your incarnation of git-svn\n\nMichael\n"},{"id":"92608","messageId":"48EC7B52.4000100@3d-radar.com","threadId":"15810","inReplyTo":"48EC7022.7030707@drmicha.warpmail.net","subject":"Re: Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-08T09:20:18Z","receivedAt":"2008-10-08T09:20:18Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Michael J Gruber wrote:\n> Knut Eldhuset venit, vidit, dixit 08.10.2008 08:34:\n>> Michael J Gruber wrote:\n>>> Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n>>>> Hi,\n>>>>\n>>>> After cloning my svn repository, I notice that the svn-id URL is \n>>>> different when going back in history:\n>>>>\n>>>> git-svn-id: https://server/trunk@300\n>>>>\n>>>> vs\n>>>>\n>>>> git-svn-id: https://server/trunk/some_folder/project/src@250\n>>>>\n>>> I take this is as an invitation for guesswork (given the amount of\n>>> details)...\n>> Sorry about that... I'm confused.\n>>> You probably have commits which don't follow your usual svn repo layout\n>>> (trunk/some_folder/project/src) but commit to trunk/ directly. The output of\n>>>\n>>> svn log -v -r300 https://server/trunk@300\n>>> svn log -v -r250 https://server/trunk/some_folder/project/src@250\n>>>\n>>> should give some clues.\n>>>\n>> Svn log shows that the same path has been modified in both cases. I see \n> \n> Does \"same path\" mean:\n> - same relative to the above paths or\n> - same absolute path?\n\nBoth say \"/trunk/some_folder/project/src/some_file\".\n\n> \n>> something strange in git, though. Our svn repository has about 6500 \n>> commits, but git shows over 10.000. Further investigation shows that a \n>> lot of svn commits have two entries in git. Some branches off of trunk \n>> do not start at r1, but off of a duplicate rNNNN. Could this be due to \n>> our unhealthy practice of creating branches off of subtrees in svn? By \n>> this I mean create a branch off of \n>> https://server/trunk/some_folder/project/src instead of \n>> https://server/trunk. If so, what can be done to fix this?\n>>\n>> As a sidenote, during git svn clone, I noticed that each time a new \n>> branch or tag was discovered, the \"scanning\" started back at r1. Is this \n>> normal? I would think the history before the branch was already \n>> imported. Of course, this could maybe be due to the bad branching \n>> practice described above.\n> \n> svn is typically \"abused\" in the sense that one svn repo is used for\n> separate projects (your subtrees). git-svn can deal with non-standard\n> repo layouts.\n> \n> I assume you can't share the svn repo publically, can you?\n\nSorry, no.\n\n> So, in order to help you, we would need to know\n> \n> - the layout of your svn repo: where are trunk, branches and tags, how\n> did you create branches and tags in svn, are \"projects\" entirely separate\n\nhttps://server/trunk\nhttps://server/branches\nhttps://server/tags\n\nWe really only have one \"project\" source tree at \nhttps://server/trunk/some_folder/project/src\n\nHowever, once the sources were at\nhttps://server/trunk/some_folder/project/old_source\n\nTherefore we have the following:\n\n$ svn log -v -r4871 https://server/\n------------------------------------------------------------------------\nr4871 | nn | 2007-09-25 13:36:25 +0200 (Tue, 25 Sep 2007) | 3 lines\nChanged paths:\n    M /trunk/project\n    D /trunk/project/old_source/some_file\n    A /trunk/project/src/client/some_file (from \n/trunk/project/old_source/some_file:4795)\n\n  commit-message\n------------------------------------------------------------------------\n\n$ svn log -v -r4869 https://server/\n------------------------------------------------------------------------\nr4869 | nn | 2007-09-25 13:14:34 +0200 (Tue, 25 Sep 2007) | 3 lines\nChanged paths:\n    M /trunk/project\n    A /trunk/project/src\n    A /trunk/project/src/client\n\n  commit-message\n\n------------------------------------------------------------------------\n\n$ svn log -v -r4868 https://server/\n------------------------------------------------------------------------\nr4868 | nn | 2007-09-25 13:14:28 +0200 (Tue, 25 Sep 2007) | 3 lines\nChanged paths:\n    M /trunk/project\n\n  commit-message\n\n------------------------------------------------------------------------\n\n$ svn log -v -r4867 https://server/\n------------------------------------------------------------------------\nr4867 | nn | 2007-09-25 12:04:58 +0200 (Tue, 25 Sep 2007) | 3 lines\nChanged paths:\n    M /trunk/project\n    A /trunk/project/some_file\n\n  commit-message\n------------------------------------------------------------------------\n\nr4868 appears twice in git. One commit is on master/trunk and has parent \nand child, while the other is on a branch and has no parent.\n\n> - your incarnation of git-svn\n> \n\n# git --version\ngit version 1.6.0.2\n\n\nRegards,\nKnut\n"},{"id":"92609","messageId":"48EC7BF8.9010707@3d-radar.com","threadId":"15810","inReplyTo":"48EC7B52.4000100@3d-radar.com","subject":"Re: Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-08T09:23:04Z","receivedAt":"2008-10-08T09:23:04Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Knut Eldhuset wrote:\n> Michael J Gruber wrote:\n>> Knut Eldhuset venit, vidit, dixit 08.10.2008 08:34:\n>>> Michael J Gruber wrote:\n>>>> Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n>>>>> Hi,\n>>>>>\n>>>>> After cloning my svn repository, I notice that the svn-id URL is \n>>>>> different when going back in history:\n>>>>>\n>>>>> git-svn-id: https://server/trunk@300\n>>>>>\n>>>>> vs\n>>>>>\n>>>>> git-svn-id: https://server/trunk/some_folder/project/src@250\n>>>>>\n>>>> I take this is as an invitation for guesswork (given the amount of\n>>>> details)...\n>>> Sorry about that... I'm confused.\n>>>> You probably have commits which don't follow your usual svn repo layout\n>>>> (trunk/some_folder/project/src) but commit to trunk/ directly. The \n>>>> output of\n>>>>\n>>>> svn log -v -r300 https://server/trunk@300\n>>>> svn log -v -r250 https://server/trunk/some_folder/project/src@250\n>>>>\n>>>> should give some clues.\n>>>>\n>>> Svn log shows that the same path has been modified in both cases. I see \n>>\n>> Does \"same path\" mean:\n>> - same relative to the above paths or\n>> - same absolute path?\n> \n> Both say \"/trunk/some_folder/project/src/some_file\".\n> \n>>\n>>> something strange in git, though. Our svn repository has about 6500 \n>>> commits, but git shows over 10.000. Further investigation shows that \n>>> a lot of svn commits have two entries in git. Some branches off of \n>>> trunk do not start at r1, but off of a duplicate rNNNN. Could this be \n>>> due to our unhealthy practice of creating branches off of subtrees in \n>>> svn? By this I mean create a branch off of \n>>> https://server/trunk/some_folder/project/src instead of \n>>> https://server/trunk. If so, what can be done to fix this?\n>>>\n>>> As a sidenote, during git svn clone, I noticed that each time a new \n>>> branch or tag was discovered, the \"scanning\" started back at r1. Is \n>>> this normal? I would think the history before the branch was already \n>>> imported. Of course, this could maybe be due to the bad branching \n>>> practice described above.\n>>\n>> svn is typically \"abused\" in the sense that one svn repo is used for\n>> separate projects (your subtrees). git-svn can deal with non-standard\n>> repo layouts.\n>>\n>> I assume you can't share the svn repo publically, can you?\n> \n> Sorry, no.\n> \n>> So, in order to help you, we would need to know\n>>\n>> - the layout of your svn repo: where are trunk, branches and tags, how\n>> did you create branches and tags in svn, are \"projects\" entirely separate\n> \n> https://server/trunk\n> https://server/branches\n> https://server/tags\n> \n> We really only have one \"project\" source tree at \n> https://server/trunk/some_folder/project/src\n> \n> However, once the sources were at\n> https://server/trunk/some_folder/project/old_source\n> \n> Therefore we have the following:\n> \n> $ svn log -v -r4871 https://server/\n> ------------------------------------------------------------------------\n> r4871 | nn | 2007-09-25 13:36:25 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>    M /trunk/project\n>    D /trunk/project/old_source/some_file\n>    A /trunk/project/src/client/some_file (from \n> /trunk/project/old_source/some_file:4795)\n> \n>  commit-message\n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4869 https://server/\n> ------------------------------------------------------------------------\n> r4869 | nn | 2007-09-25 13:14:34 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>    M /trunk/project\n>    A /trunk/project/src\n>    A /trunk/project/src/client\n> \n>  commit-message\n> \n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4868 https://server/\n> ------------------------------------------------------------------------\n> r4868 | nn | 2007-09-25 13:14:28 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>    M /trunk/project\n> \n>  commit-message\n> \n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4867 https://server/\n> ------------------------------------------------------------------------\n> r4867 | nn | 2007-09-25 12:04:58 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>    M /trunk/project\n>    A /trunk/project/some_file\n> \n>  commit-message\n> ------------------------------------------------------------------------\n> \n> r4868 appears twice in git. One commit is on master/trunk and has parent \n> and child, while the other is on a branch and has no parent.\n> \n\nSorry, that should be r4869.\n\n>> - your incarnation of git-svn\n>>\n> \n> # git --version\n> git version 1.6.0.2\n> \n> \n\nRegards,\nKnut\n"},{"id":"92649","messageId":"48EDA1BD.6070209@3d-radar.com","threadId":"15810","inReplyTo":"48EC7022.7030707@drmicha.warpmail.net","subject":"Re: Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-09T06:16:29Z","receivedAt":"2008-10-09T06:16:29Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Michael J Gruber wrote:\n> svn is typically \"abused\" in the sense that one svn repo is used for\n> separate projects (your subtrees). git-svn can deal with non-standard\n> repo layouts.\n> \n\nI've decided to give up on cloning the whole svn repo. Cloning just our \nsrc folder is sufficient for now, and it does follow a sensible repo layout.\n\nMaybe I'll get back to this if I manage to find a way of reproducing the \npreviously described behavior.\n\nRegards,\nKnut\n"},{"id":"92672","messageId":"48EE132E.1040407@drmicha.warpmail.net","threadId":"15810","inReplyTo":"48EC7B52.4000100@3d-radar.com","subject":"Re: Different svn-id URLs in history","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2008-10-09T14:20:30Z","receivedAt":"2008-10-09T14:20:30Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Knut Eldhuset venit, vidit, dixit 08.10.2008 11:20:\n> Michael J Gruber wrote:\n>> Knut Eldhuset venit, vidit, dixit 08.10.2008 08:34:\n>>> Michael J Gruber wrote:\n>>>> Knut Eldhuset venit, vidit, dixit 07.10.2008 12:58:\n>>>>> Hi,\n>>>>>\n>>>>> After cloning my svn repository, I notice that the svn-id URL is \n>>>>> different when going back in history:\n>>>>>\n>>>>> git-svn-id: https://server/trunk@300\n>>>>>\n>>>>> vs\n>>>>>\n>>>>> git-svn-id: https://server/trunk/some_folder/project/src@250\n>>>>>\n>>>> I take this is as an invitation for guesswork (given the amount of\n>>>> details)...\n>>> Sorry about that... I'm confused.\n>>>> You probably have commits which don't follow your usual svn repo layout\n>>>> (trunk/some_folder/project/src) but commit to trunk/ directly. The output of\n>>>>\n>>>> svn log -v -r300 https://server/trunk@300\n>>>> svn log -v -r250 https://server/trunk/some_folder/project/src@250\n>>>>\n>>>> should give some clues.\n>>>>\n>>> Svn log shows that the same path has been modified in both cases. I see \n>> Does \"same path\" mean:\n>> - same relative to the above paths or\n>> - same absolute path?\n> \n> Both say \"/trunk/some_folder/project/src/some_file\".\n> \n>>> something strange in git, though. Our svn repository has about 6500 \n>>> commits, but git shows over 10.000. Further investigation shows that a \n>>> lot of svn commits have two entries in git. Some branches off of trunk \n>>> do not start at r1, but off of a duplicate rNNNN. Could this be due to \n>>> our unhealthy practice of creating branches off of subtrees in svn? By \n>>> this I mean create a branch off of \n>>> https://server/trunk/some_folder/project/src instead of \n>>> https://server/trunk. If so, what can be done to fix this?\n>>>\n>>> As a sidenote, during git svn clone, I noticed that each time a new \n>>> branch or tag was discovered, the \"scanning\" started back at r1. Is this \n>>> normal? I would think the history before the branch was already \n>>> imported. Of course, this could maybe be due to the bad branching \n>>> practice described above.\n>> svn is typically \"abused\" in the sense that one svn repo is used for\n>> separate projects (your subtrees). git-svn can deal with non-standard\n>> repo layouts.\n>>\n>> I assume you can't share the svn repo publically, can you?\n> \n> Sorry, no.\n> \n>> So, in order to help you, we would need to know\n>>\n>> - the layout of your svn repo: where are trunk, branches and tags, how\n>> did you create branches and tags in svn, are \"projects\" entirely separate\n> \n> https://server/trunk\n> https://server/branches\n> https://server/tags\n> \n> We really only have one \"project\" source tree at \n> https://server/trunk/some_folder/project/src\n> \n> However, once the sources were at\n> https://server/trunk/some_folder/project/old_source\n\nThat may be the source of the trouble. In fact, the log below indicates\nthat it is more like the following two paths:\n\nhttps://server/trunk/project/old_source\nhttps://server/trunk/project/src/client\n\n> Therefore we have the following:\n> \n> $ svn log -v -r4871 https://server/\n> ------------------------------------------------------------------------\n> r4871 | nn | 2007-09-25 13:36:25 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>     M /trunk/project\n>     D /trunk/project/old_source/some_file\n>     A /trunk/project/src/client/some_file (from \n> /trunk/project/old_source/some_file:4795)\n> \n>   commit-message\n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4869 https://server/\n> ------------------------------------------------------------------------\n> r4869 | nn | 2007-09-25 13:14:34 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>     M /trunk/project\n>     A /trunk/project/src\n>     A /trunk/project/src/client\n> \n>   commit-message\n> \n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4868 https://server/\n> ------------------------------------------------------------------------\n> r4868 | nn | 2007-09-25 13:14:28 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>     M /trunk/project\n> \n>   commit-message\n> \n\nThat one is funny. A modified directory but no paths modified\nunderneath. Was this a propset?\n\n> ------------------------------------------------------------------------\n> \n> $ svn log -v -r4867 https://server/\n> ------------------------------------------------------------------------\n> r4867 | nn | 2007-09-25 12:04:58 +0200 (Tue, 25 Sep 2007) | 3 lines\n> Changed paths:\n>     M /trunk/project\n>     A /trunk/project/some_file\n> \n>   commit-message\n> ------------------------------------------------------------------------\n\nMaybe you're trying too hard to disguise things. Are you really adding\nsome_file right under project here and under project/src/client in r4871?\n\n> \n> r4868 appears twice in git. One commit is on master/trunk and has parent \n> and child, while the other is on a branch and has no parent.\n> \n>> - your incarnation of git-svn\n>>\n> \n> # git --version\n> git version 1.6.0.2\n\nI actually meant incantation, I guess I should brush up on my little\nlatin, uhm ;)\n\nSo, did you use something like\n\ngit svn init -s https://server/\n\nor\n\ngit svn init -T trunk/project/src/client -t 'tags/*/project/src/client'\n-b 'branches/*/project/src/client' https://server/\n\nMy suggestion would to use two svn sections (option \"-R\") with different\nconfigs for different repo structures, and to fetch the first one with\n\"-r1:4866\" and the second one with \"-r4871:HEAD\". Reorganising the svn\nrepo layout can confuse git-svn quite a bit (and understandably so).\nUsing different configs for different \"epochs\" helps. grafts are your\nfriend when it comes to connecting the two.\n\nMichael\n"},{"id":"92735","messageId":"48EF18C0.3050200@3d-radar.com","threadId":"15810","inReplyTo":"48EE132E.1040407@drmicha.warpmail.net","subject":"Re: Different svn-id URLs in history","fromName":"Knut Eldhuset","fromEmail":"knut@3d-radar.com","sentAt":"2008-10-10T08:56:32Z","receivedAt":"2008-10-10T08:56:32Z","isPatch":false,"sender":{"key":"knut@3d-radar.com","avatar":null},"body":"Michael J Gruber wrote:\n> Knut Eldhuset venit, vidit, dixit 08.10.2008 11:20:\n>> Michael J Gruber wrote:\n>>> Knut Eldhuset venit, vidit, dixit 08.10.2008 08:34:\n\n<snip>\n\n>>> So, in order to help you, we would need to know\n>>>\n>>> - the layout of your svn repo: where are trunk, branches and tags, how\n>>> did you create branches and tags in svn, are \"projects\" entirely separate\n>> https://server/trunk\n>> https://server/branches\n>> https://server/tags\n>>\n>> We really only have one \"project\" source tree at \n>> https://server/trunk/some_folder/project/src\n>>\n>> However, once the sources were at\n>> https://server/trunk/some_folder/project/old_source\n> \n> That may be the source of the trouble. In fact, the log below indicates\n> that it is more like the following two paths:\n> \n> https://server/trunk/project/old_source\n> https://server/trunk/project/src/client\n> \n\nI think my description is correct, but these particular log messages may \nnot be the best examples. We did have files and folders in \"old_source\" \nthat moved to \"src\".\n\n>> Therefore we have the following:\n>>\n>> $ svn log -v -r4871 https://server/\n>> ------------------------------------------------------------------------\n>> r4871 | nn | 2007-09-25 13:36:25 +0200 (Tue, 25 Sep 2007) | 3 lines\n>> Changed paths:\n>>     M /trunk/project\n>>     D /trunk/project/old_source/some_file\n>>     A /trunk/project/src/client/some_file (from \n>> /trunk/project/old_source/some_file:4795)\n>>\n>>   commit-message\n>> ------------------------------------------------------------------------\n>>\n>> $ svn log -v -r4869 https://server/\n>> ------------------------------------------------------------------------\n>> r4869 | nn | 2007-09-25 13:14:34 +0200 (Tue, 25 Sep 2007) | 3 lines\n>> Changed paths:\n>>     M /trunk/project\n>>     A /trunk/project/src\n>>     A /trunk/project/src/client\n>>\n>>   commit-message\n>>\n>> ------------------------------------------------------------------------\n>>\n>> $ svn log -v -r4868 https://server/\n>> ------------------------------------------------------------------------\n>> r4868 | nn | 2007-09-25 13:14:28 +0200 (Tue, 25 Sep 2007) | 3 lines\n>> Changed paths:\n>>     M /trunk/project\n>>\n>>   commit-message\n>>\n> \n> That one is funny. A modified directory but no paths modified\n> underneath. Was this a propset?\n> \n\nThese give identical output:\n\nsvn log -v -r4868 --xml https://server\n\nand\n\nsvn log -v -r4868 --with-all-revprops --xml https://server\n\nI don't understand what happened there. It was a commit made with svk, \nso maybe that had something to do with it.\n\n>> ------------------------------------------------------------------------\n>>\n>> $ svn log -v -r4867 https://server/\n>> ------------------------------------------------------------------------\n>> r4867 | nn | 2007-09-25 12:04:58 +0200 (Tue, 25 Sep 2007) | 3 lines\n>> Changed paths:\n>>     M /trunk/project\n>>     A /trunk/project/some_file\n>>\n>>   commit-message\n>> ------------------------------------------------------------------------\n> \n> Maybe you're trying too hard to disguise things. Are you really adding\n> some_file right under project here and under project/src/client in r4871?\n> \n\nNo, those were different files... I'm sorry I can't share the repo publicly.\n\n>> r4868 appears twice in git. One commit is on master/trunk and has parent \n>> and child, while the other is on a branch and has no parent.\n>>\n>>> - your incarnation of git-svn\n>>>\n>> # git --version\n>> git version 1.6.0.2\n> \n> I actually meant incantation, I guess I should brush up on my little\n> latin, uhm ;)\n> \n> So, did you use something like\n> \n> git svn init -s https://server/\n> \n> or\n> \n> git svn init -T trunk/project/src/client -t 'tags/*/project/src/client'\n> -b 'branches/*/project/src/client' https://server/\n> \n\nI used\n\ngit svn clone -s https://server/\n\ninitially. Then I tried\n\ngit svn clone -T trunk/project/src -r tags -b branches https://server/\n\nwhich gave better results. Then I settled on using \"-r4869:HEAD\".\n\n> My suggestion would to use two svn sections (option \"-R\") with different\n> configs for different repo structures, and to fetch the first one with\n> \"-r1:4866\" and the second one with \"-r4871:HEAD\". Reorganising the svn\n> repo layout can confuse git-svn quite a bit (and understandably so).\n> Using different configs for different \"epochs\" helps. grafts are your\n> friend when it comes to connecting the two.\n> \n> Michael\n\nGood suggestion. I didn't realize one could do it that way.\n\nRegards,\nKnut\n"}]}