You are viewing a plain text version of this content. The canonical link for it is here.
Posted to infrastructure-dev@apache.org by Werner Punz <we...@gmail.com> on 2009/09/02 13:36:01 UTC
Git + svn problem?
Hia i am not sure if I have a problem here or the git mirror itself has
problems. So I ask here first before filing a jira issue on it.
I noticed you guys have mirrored the myfaces trunk
If I run following sequence
PROJECT_NAME="myfaces"
git clone git://git.apache.org/"$PROJECT_NAME"
cd "$PROJECT_NAME"/.git; wget http://git.apache.org/authors.txt; cd ..
git config svn.authorsfile ".git/authors.txt"
git svn init --prefix=origin/ --tags=tags --trunk=trunk
--branches=branches https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current
git svn rebase
the rebase fails with
Unable to determine upstream SVN information from working tree history
The issue seems to be that the git mirrored project is located under
https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current but that should
not be a problem should it?
Not sure what the exact problem here is.
I am for now back to git-svn clone and rebase :-)
Werner
Re: Git + svn problem?
Posted by Werner Punz <we...@gmail.com>.
Daniel Spiewak schrieb:
> Ideally, svn:externals should be converted into git submodules.
> Unfortunately, I don't think that git-svn supports anything like this at the
> moment (though I seem to recall some discussion of a similar feature a while
> back). So, unless you want to start hacking around in the perl scripts...
>
> Daniel
Actually no to my knowledge it is not supported since the svn:externals
and git submodules do not match 1:1 exactly the git people are still
undecided how to solve it. For my privat projects I resolved it by using
symlinks and treating externals as separate projects.
Werner
Re: Git + svn problem?
Posted by Daniel Spiewak <dj...@gmail.com>.
Ideally, svn:externals should be converted into git submodules.
Unfortunately, I don't think that git-svn supports anything like this at the
moment (though I seem to recall some discussion of a similar feature a while
back). So, unless you want to start hacking around in the perl scripts...
Daniel
On Tue, Sep 15, 2009 at 3:51 AM, Jukka Zitting <ju...@gmail.com>wrote:
> Hi,
>
> On Tue, Sep 15, 2009 at 10:48 AM, Werner Punz <we...@gmail.com>
> wrote:
> > Ok Another problem I noticed is that we use extensively externals in our
> > project. I know there are limits to git-svn which is probably used for
> > mirroring, anyway the externals are not pulled in. Which I assume
> > is not resolvable for now. Am I right.
>
> Yes, you're right.
>
> If you know how to make git-svn better support svn externals, then I'd
> be happy to make the tweaks in the mirroring scripts.
>
> BR,
>
> Jukka Zitting
>
Re: Git + svn problem?
Posted by Jukka Zitting <ju...@gmail.com>.
Hi,
On Tue, Sep 15, 2009 at 10:48 AM, Werner Punz <we...@gmail.com> wrote:
> Ok Another problem I noticed is that we use extensively externals in our
> project. I know there are limits to git-svn which is probably used for
> mirroring, anyway the externals are not pulled in. Which I assume
> is not resolvable for now. Am I right.
Yes, you're right.
If you know how to make git-svn better support svn externals, then I'd
be happy to make the tweaks in the mirroring scripts.
BR,
Jukka Zitting
Re: Git + svn problem?
Posted by Werner Punz <we...@gmail.com>.
Ok Another problem I noticed is that we use extensively externals in our
project. I know there are limits to git-svn which is probably used for
mirroring, anyway the externals are not pulled in. Which I assume
is not resolvable for now. Am I right.
Werner
Werner Punz schrieb:
> Ok sorry for this post, my fault I accidentally used a wrong url
> for the rebase.
>
>
> Werner
>
>
> Werner Punz schrieb:
>> Hia i am not sure if I have a problem here or the git mirror itself
>> has problems. So I ask here first before filing a jira issue on it.
>>
>> I noticed you guys have mirrored the myfaces trunk
>>
>> If I run following sequence
>>
>> PROJECT_NAME="myfaces"
>> git clone git://git.apache.org/"$PROJECT_NAME"
>> cd "$PROJECT_NAME"/.git; wget http://git.apache.org/authors.txt; cd ..
>> git config svn.authorsfile ".git/authors.txt"
>> git svn init --prefix=origin/ --tags=tags --trunk=trunk
>> --branches=branches
>> https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current
>> git svn rebase
>>
>> the rebase fails with
>> Unable to determine upstream SVN information from working tree history
>>
>> The issue seems to be that the git mirrored project is located under
>> https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current but that
>> should not be a problem should it?
>>
>> Not sure what the exact problem here is.
>> I am for now back to git-svn clone and rebase :-)
>>
>>
>>
>> Werner
>>
>>
>
>
Re: Git + svn problem?
Posted by Werner Punz <we...@gmail.com>.
Ok sorry for this post, my fault I accidentally used a wrong url
for the rebase.
Werner
Werner Punz schrieb:
> Hia i am not sure if I have a problem here or the git mirror itself has
> problems. So I ask here first before filing a jira issue on it.
>
> I noticed you guys have mirrored the myfaces trunk
>
> If I run following sequence
>
> PROJECT_NAME="myfaces"
> git clone git://git.apache.org/"$PROJECT_NAME"
> cd "$PROJECT_NAME"/.git; wget http://git.apache.org/authors.txt; cd ..
> git config svn.authorsfile ".git/authors.txt"
> git svn init --prefix=origin/ --tags=tags --trunk=trunk
> --branches=branches
> https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current
> git svn rebase
>
> the rebase fails with
> Unable to determine upstream SVN information from working tree history
>
> The issue seems to be that the git mirrored project is located under
> https://svn.apache.org/repos/asf/"$PROJECT_NAME"/current but that should
> not be a problem should it?
>
> Not sure what the exact problem here is.
> I am for now back to git-svn clone and rebase :-)
>
>
>
> Werner
>
>