{"thread":{"id":"3775","subject":"git-svn and svn sw --relocate","startedAt":"2006-04-02T18:04:46Z","lastAt":"2006-04-03T22:39:54Z","messageCount":4,"participants":["Nicolas Vilz 'niv'","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18225","messageId":"4430123E.5090605@iaglans.de","threadId":"3775","inReplyTo":null,"subject":"git-svn and svn sw --relocate","fromName":"Nicolas Vilz 'niv'","fromEmail":"niv@iaglans.de","sentAt":"2006-04-02T18:04:46Z","receivedAt":"2006-04-02T18:04:46Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"ok, guys... next question:\n\ni have now my repository locally and i want to get it remotely on a\nserver, in order to have a few collaborators...\n\nthe steps on the svn-side are clear. But what do i have todo on the\ngit-svn-side of this life?\n\ndoes a simple \"svn sw --relocate\" do the job in the git-svn meta-dir?\n\nSincerly\nNicolas\n"},{"id":"18244","messageId":"20060402222100.GA17888@localdomain","threadId":"3775","inReplyTo":"4430123E.5090605@iaglans.de","subject":"Re: git-svn and svn sw --relocate","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-04-02T22:21:00Z","receivedAt":"2006-04-02T22:21:00Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Nicolas Vilz 'niv' wrote:\n> ok, guys... next question:\n> \n> i have now my repository locally and i want to get it remotely on a\n> server, in order to have a few collaborators...\n> \n> the steps on the svn-side are clear. But what do i have todo on the\n> git-svn-side of this life?\n> \n> does a simple \"svn sw --relocate\" do the job in the git-svn meta-dir?\n\nYes, you'll need to do that in .git/git-svn/tree and also update\n.git/git-svn/info/url by hand.\n\n-- \nEric Wong\n"},{"id":"18292","messageId":"44314B41.3050902@iaglans.de","threadId":"3775","inReplyTo":"20060402222100.GA17888@localdomain","subject":"Re: git-svn and svn sw --relocate","fromName":"Nicolas Vilz 'niv'","fromEmail":"niv@iaglans.de","sentAt":"2006-04-03T16:20:17Z","receivedAt":"2006-04-03T16:20:17Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"Eric Wong wrote:\n> Nicolas Vilz 'niv' wrote:\n>>i have now my repository locally and i want to get it remotely on a\n>>server, in order to have a few collaborators...\n>>\n>>the steps on the svn-side are clear. But what do i have todo on the\n>>git-svn-side of this life?\n>>\n>>does a simple \"svn sw --relocate\" do the job in the git-svn meta-dir?\n> \n> \n> Yes, you'll need to do that in .git/git-svn/tree and also update\n> .git/git-svn/info/url by hand.\n\nWill there be any other sha1-sums for that repository so that i have to\nmerge them again and again? This issue occured to me the last time i\nencountered the git-svn-change with the external sources, where i had to\nrepair my external git-svn-tree, which resulted in new sha1sums\nsomehow... that was very unpleasant to my collegue..\n\nAlthough the uuids there should remain the same... so i think, that\nwould be no problem to try.\n\nThanks for the tip.\n\nNicolas\n"},{"id":"18310","messageId":"20060403223954.GB16726@hand.yhbt.net","threadId":"3775","inReplyTo":"44314B41.3050902@iaglans.de","subject":"Re: git-svn and svn sw --relocate","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2006-04-03T22:39:54Z","receivedAt":"2006-04-03T22:39:54Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Nicolas Vilz 'niv' wrote:\n> Eric Wong wrote:\n> > Nicolas Vilz 'niv' wrote:\n> >>i have now my repository locally and i want to get it remotely on a\n> >>server, in order to have a few collaborators...\n> >>\n> >>the steps on the svn-side are clear. But what do i have todo on the\n> >>git-svn-side of this life?\n> >>\n> >>does a simple \"svn sw --relocate\" do the job in the git-svn meta-dir?\n> > \n> > \n> > Yes, you'll need to do that in .git/git-svn/tree and also update\n> > .git/git-svn/info/url by hand.\n> \n> Will there be any other sha1-sums for that repository so that i have to\n> merge them again and again? This issue occured to me the last time i\n> encountered the git-svn-change with the external sources, where i had to\n> repair my external git-svn-tree, which resulted in new sha1sums\n> somehow... that was very unpleasant to my collegue..\n\nsha1-sums for commits? or trees? I'm not sure that I follow, git-svn\nshould make commits with at least two explicit parents (one being the\ncommit you're using and, and the other remote/git-svn) back to\nremotes/git-svn.\n\nThe commit sha1s for the same svn tree do not necessary always match,\nand ac7490506418e3ec495775e432b7040a17449fa9 acknowledges that:\n\n contrib/git-svn: allow rebuild to work on non-linear remote heads\n \n Because committing back to an SVN repository from different\n machines can result in different lineages, two different\n repositories running git-svn can result in different commit\n SHA1s (but of the same tree). Sometimes trees that are tracked\n independently are merged together (usually via children),\n resulting in non-unique git-svn-id: lines in rev-list.\n\nThe tree sha1 should always match, however. You can use the\n--branch option to do automatic branch joining\nbased on tree sha1 checksums to combine history.\n\n-- \nEric Wong\n"}]}