# git-svn and svn sw --relocate 4 messages from 2006-04-02 to 2006-04-03. Participants: Nicolas Vilz 'niv', Eric Wong. Thread: https://gitlist.dev/t/3775 ## Nicolas Vilz 'niv', 2006-04-02 18:04 Subject: git-svn and svn sw --relocate Message-ID: <4430123E.5090605@iaglans.de> URL: https://gitlist.dev/e/4430123E.5090605%40iaglans.de ``` ok, guys... next question: i have now my repository locally and i want to get it remotely on a server, in order to have a few collaborators... the steps on the svn-side are clear. But what do i have todo on the git-svn-side of this life? does a simple "svn sw --relocate" do the job in the git-svn meta-dir? Sincerly Nicolas ``` ## Eric Wong, 2006-04-02 22:21 Subject: Re: git-svn and svn sw --relocate Message-ID: <20060402222100.GA17888@localdomain> URL: https://gitlist.dev/e/20060402222100.GA17888%40localdomain In-Reply-To: <4430123E.5090605@iaglans.de> ``` Nicolas Vilz 'niv' wrote: > ok, guys... next question: > > i have now my repository locally and i want to get it remotely on a > server, in order to have a few collaborators... > > the steps on the svn-side are clear. But what do i have todo on the > git-svn-side of this life? > > does a simple "svn sw --relocate" do the job in the git-svn meta-dir? Yes, you'll need to do that in .git/git-svn/tree and also update .git/git-svn/info/url by hand. -- Eric Wong ``` ## Nicolas Vilz 'niv', 2006-04-03 16:20 Subject: Re: git-svn and svn sw --relocate Message-ID: <44314B41.3050902@iaglans.de> URL: https://gitlist.dev/e/44314B41.3050902%40iaglans.de In-Reply-To: <20060402222100.GA17888@localdomain> ``` Eric Wong wrote: > Nicolas Vilz 'niv' wrote: >>i have now my repository locally and i want to get it remotely on a >>server, in order to have a few collaborators... >> >>the steps on the svn-side are clear. But what do i have todo on the >>git-svn-side of this life? >> >>does a simple "svn sw --relocate" do the job in the git-svn meta-dir? > > > Yes, you'll need to do that in .git/git-svn/tree and also update > .git/git-svn/info/url by hand. Will there be any other sha1-sums for that repository so that i have to merge them again and again? This issue occured to me the last time i encountered the git-svn-change with the external sources, where i had to repair my external git-svn-tree, which resulted in new sha1sums somehow... that was very unpleasant to my collegue.. Although the uuids there should remain the same... so i think, that would be no problem to try. Thanks for the tip. Nicolas ``` ## Eric Wong, 2006-04-03 22:39 Subject: Re: git-svn and svn sw --relocate Message-ID: <20060403223954.GB16726@hand.yhbt.net> URL: https://gitlist.dev/e/20060403223954.GB16726%40hand.yhbt.net In-Reply-To: <44314B41.3050902@iaglans.de> ``` Nicolas Vilz 'niv' wrote: > Eric Wong wrote: > > Nicolas Vilz 'niv' wrote: > >>i have now my repository locally and i want to get it remotely on a > >>server, in order to have a few collaborators... > >> > >>the steps on the svn-side are clear. But what do i have todo on the > >>git-svn-side of this life? > >> > >>does a simple "svn sw --relocate" do the job in the git-svn meta-dir? > > > > > > Yes, you'll need to do that in .git/git-svn/tree and also update > > .git/git-svn/info/url by hand. > > Will there be any other sha1-sums for that repository so that i have to > merge them again and again? This issue occured to me the last time i > encountered the git-svn-change with the external sources, where i had to > repair my external git-svn-tree, which resulted in new sha1sums > somehow... that was very unpleasant to my collegue.. sha1-sums for commits? or trees? I'm not sure that I follow, git-svn should make commits with at least two explicit parents (one being the commit you're using and, and the other remote/git-svn) back to remotes/git-svn. The commit sha1s for the same svn tree do not necessary always match, and ac7490506418e3ec495775e432b7040a17449fa9 acknowledges that: contrib/git-svn: allow rebuild to work on non-linear remote heads Because committing back to an SVN repository from different machines can result in different lineages, two different repositories running git-svn can result in different commit SHA1s (but of the same tree). Sometimes trees that are tracked independently are merged together (usually via children), resulting in non-unique git-svn-id: lines in rev-list. The tree sha1 should always match, however. You can use the --branch option to do automatic branch joining based on tree sha1 checksums to combine history. -- Eric Wong ```