* git-svn and svn sw --relocate
@ 2006-04-02 18:04 Nicolas Vilz 'niv'
2006-04-02 22:21 ` Eric Wong
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Vilz 'niv' @ 2006-04-02 18:04 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-svn and svn sw --relocate
2006-04-02 18:04 git-svn and svn sw --relocate Nicolas Vilz 'niv'
@ 2006-04-02 22:21 ` Eric Wong
2006-04-03 16:20 ` Nicolas Vilz 'niv'
0 siblings, 1 reply; 4+ messages in thread
From: Eric Wong @ 2006-04-02 22:21 UTC (permalink / raw)
To: Nicolas Vilz 'niv'; +Cc: git
Nicolas Vilz 'niv' <niv@iaglans.de> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-svn and svn sw --relocate
2006-04-02 22:21 ` Eric Wong
@ 2006-04-03 16:20 ` Nicolas Vilz 'niv'
2006-04-03 22:39 ` Eric Wong
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Vilz 'niv' @ 2006-04-03 16:20 UTC (permalink / raw)
To: git
Eric Wong wrote:
> Nicolas Vilz 'niv' <niv@iaglans.de> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git-svn and svn sw --relocate
2006-04-03 16:20 ` Nicolas Vilz 'niv'
@ 2006-04-03 22:39 ` Eric Wong
0 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2006-04-03 22:39 UTC (permalink / raw)
To: Nicolas Vilz 'niv'; +Cc: git
Nicolas Vilz 'niv' <niv@iaglans.de> wrote:
> Eric Wong wrote:
> > Nicolas Vilz 'niv' <niv@iaglans.de> 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 <refname/commit> option to do automatic branch joining
based on tree sha1 checksums to combine history.
--
Eric Wong
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-04-03 22:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-04-02 18:04 git-svn and svn sw --relocate Nicolas Vilz 'niv'
2006-04-02 22:21 ` Eric Wong
2006-04-03 16:20 ` Nicolas Vilz 'niv'
2006-04-03 22:39 ` Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).