* Fork of abandoned SVN mirror - how to keep up to date with the SVN
@ 2009-03-28 13:11 jamespetts
2009-03-28 16:22 ` Jacob Helwig
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-28 13:11 UTC (permalink / raw)
To: git
For some months, I have been working on a
http://github.com/jamespetts/simutrans-experimental/tree fork of the
popular open source transport simulation game, http://www.simutrans.com
Simutrans . Simutrans uses SVN as its official VCS, but I have been using
Git, by forking an http://github.com/aburch/simutrans/tree/master
unofficial mirror of the Simutrans SVN on Github. That has made it
extremely easy for me to merge in updates to the trunk code whilst
continuing to work on my branch.
However, last week, the unofficial mirror on Github suddenly stopped
tracking the updates on the SVN. I have sent a message to the person who
administers it, but he has not been around for a long time, and I fear that
he probably will not reply - he did not reply to a message that I sent him
some time ago. I do not really know what to do now to keep my branch
synchronised. I have tried creating my own mirror of the SVN on Github, but
there are two problems: (1) I cannot for the life of me get the creation of
the mirror to work - it gets stuck permanently at "fetching authors"; and
(2) even if I did succeed in creating a mirror, it would no longer be the
same as the branch from which I forked, so Git would not be able to keep a
track of which parts of the code I intend to keep different from the trunk,
and which are the new updates to the trunk that I want to incorporate in my
branch.
What is the best way of dealing with this mess to try to re-instate an easy
and reliable system of taking updates from the SVN and merging them into my
branched code?
--
View this message in context: http://www.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp22756729p22756729.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 13:11 Fork of abandoned SVN mirror - how to keep up to date with the SVN jamespetts
@ 2009-03-28 16:22 ` Jacob Helwig
2009-03-28 16:46 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Jacob Helwig @ 2009-03-28 16:22 UTC (permalink / raw)
To: Git; +Cc: jamespetts
I just tried cloning this repo using the command below, and it appears
to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
is the full command you're using when it will hang?
git svn clone -s --username=anon --prefix=svn/ \
svn://tron.homeunix.org/simutrans/simutrans
On Sat, Mar 28, 2009 at 06:11, jamespetts <jamespetts@yahoo.com> wrote:
>
> For some months, I have been working on a
> http://github.com/jamespetts/simutrans-experimental/tree fork of the
> popular open source transport simulation game, http://www.simutrans.com
> Simutrans . Simutrans uses SVN as its official VCS, but I have been using
> Git, by forking an http://github.com/aburch/simutrans/tree/master
> unofficial mirror of the Simutrans SVN on Github. That has made it
> extremely easy for me to merge in updates to the trunk code whilst
> continuing to work on my branch.
>
> However, last week, the unofficial mirror on Github suddenly stopped
> tracking the updates on the SVN. I have sent a message to the person who
> administers it, but he has not been around for a long time, and I fear that
> he probably will not reply - he did not reply to a message that I sent him
> some time ago. I do not really know what to do now to keep my branch
> synchronised. I have tried creating my own mirror of the SVN on Github, but
> there are two problems: (1) I cannot for the life of me get the creation of
> the mirror to work - it gets stuck permanently at "fetching authors"; and
> (2) even if I did succeed in creating a mirror, it would no longer be the
> same as the branch from which I forked, so Git would not be able to keep a
> track of which parts of the code I intend to keep different from the trunk,
> and which are the new updates to the trunk that I want to incorporate in my
> branch.
>
> What is the best way of dealing with this mess to try to re-instate an easy
> and reliable system of taking updates from the SVN and merging them into my
> branched code?
> --
> View this message in context: http://www.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp22756729p22756729.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 22+ messages in thread* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 16:22 ` Jacob Helwig
@ 2009-03-28 16:46 ` jamespetts
2009-03-28 18:02 ` Jacob Helwig
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-28 16:46 UTC (permalink / raw)
To: git
I just tried cloning this repo using the command below, and it appears
to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
is the full command you're using when it will hang?
I was not using the command line - I was using the GUI on the Github website.
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549665.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 16:46 ` jamespetts
@ 2009-03-28 18:02 ` Jacob Helwig
2009-03-28 18:06 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Jacob Helwig @ 2009-03-28 18:02 UTC (permalink / raw)
To: jamespetts; +Cc: git
The GitHub "Import a Subversion Repository" page does mention that you
should try to avoid "svn://example.com/project/svn" style URLs (which
SimuTrans uses). Maybe it's having trouble with needing a username &
empty password?
Unfortunately, I've never actually used the "Import from SVN" on
GitHub. I see you've already posted to http://support.github.com/
about this. Have you tried asking in the GitHub IRC channel?
On Sat, Mar 28, 2009 at 09:46, jamespetts <jamespetts@yahoo.com> wrote:
>
>
>
> I just tried cloning this repo using the command below, and it appears
> to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
> is the full command you're using when it will hang?
>
> I was not using the command line - I was using the GUI on the Github website.
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549665.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 18:02 ` Jacob Helwig
@ 2009-03-28 18:06 ` jamespetts
2009-03-28 20:27 ` Jacob Helwig
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-28 18:06 UTC (permalink / raw)
To: git
Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
Any suggestions about how to deal with the other problem?
The GitHub "Import a Subversion Repository" page does mention that you
should try to avoid "svn://example.com/project/svn" style URLs (which
SimuTrans uses). Maybe it's having trouble with needing a username &
empty password?
Unfortunately, I've never actually used the "Import from SVN" on
GitHub. I see you've already posted to http://support.github.com/
about this. Have you tried asking in the GitHub IRC channel?
On Sat, Mar 28, 2009 at 09:46, jamespetts <jamespetts@yahoo.com> wrote:
>
>
>
> I just tried cloning this repo using the command below, and it appears
> to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
> is the full command you're using when it will hang?
>
> I was not using the command line - I was using the GUI on the Github website.
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549665.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549943.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 18:06 ` jamespetts
@ 2009-03-28 20:27 ` Jacob Helwig
2009-03-28 21:46 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Jacob Helwig @ 2009-03-28 20:27 UTC (permalink / raw)
To: jamespetts; +Cc: git
On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>
> Any suggestions about how to deal with the other problem?
>
It looks like GitHub won't keep the project in sync for you, so you're
probably best off doing the git-svn clone yourself, and maintaining it
that way.
http://github.com/guides/import-from-subversion
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 20:27 ` Jacob Helwig
@ 2009-03-28 21:46 ` jamespetts
2009-03-28 21:55 ` Sverre Rabbelier
2009-03-28 22:04 ` Jacob Helwig
0 siblings, 2 replies; 22+ messages in thread
From: jamespetts @ 2009-03-28 21:46 UTC (permalink / raw)
To: git
Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>
> Any suggestions about how to deal with the other problem?
>
It looks like GitHub won't keep the project in sync for you, so you're
probably best off doing the git-svn clone yourself, and maintaining it
that way.
http://github.com/guides/import-from-subversion
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 21:46 ` jamespetts
@ 2009-03-28 21:55 ` Sverre Rabbelier
2009-03-28 22:01 ` jamespetts
2009-03-28 22:04 ` Jacob Helwig
1 sibling, 1 reply; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-28 21:55 UTC (permalink / raw)
To: jamespetts; +Cc: git
Heya,
On Sat, Mar 28, 2009 at 22:46, jamespetts <jamespetts@yahoo.com> wrote:
> Thank you for your reply. Unfortunately, I cannot for the life of me get
> git-svn to work. It refuses to recognise "git svn" as a valid command,
What version are you using? Are you on Windows perhaps?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 21:55 ` Sverre Rabbelier
@ 2009-03-28 22:01 ` jamespetts
0 siblings, 0 replies; 22+ messages in thread
From: jamespetts @ 2009-03-28 22:01 UTC (permalink / raw)
To: git
Yes, indeed, as stated in the above post, I am using Windows :-)
Heya,
On Sat, Mar 28, 2009 at 22:46, jamespetts <jamespetts@yahoo.com> wrote:
> Thank you for your reply. Unfortunately, I cannot for the life of me get
> git-svn to work. It refuses to recognise "git svn" as a valid command,
What version are you using? Are you on Windows perhaps?
--
Cheers,
Sverre Rabbelier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550590.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 21:46 ` jamespetts
2009-03-28 21:55 ` Sverre Rabbelier
@ 2009-03-28 22:04 ` Jacob Helwig
2009-03-28 22:18 ` jamespetts
1 sibling, 1 reply; 22+ messages in thread
From: Jacob Helwig @ 2009-03-28 22:04 UTC (permalink / raw)
To: jamespetts; +Cc: git
On Sat, Mar 28, 2009 at 14:46, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
>
> Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
>
>
> On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>>
>> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>>
>> Any suggestions about how to deal with the other problem?
>>
>
> It looks like GitHub won't keep the project in sync for you, so you're
> probably best off doing the git-svn clone yourself, and maintaining it
> that way.
>
> http://github.com/guides/import-from-subversion
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
You should be able to use the exact command I showed earlier within
"git bash". Also, you'd want to type "git help svn", not "svn --help"
to see the manual.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 22:04 ` Jacob Helwig
@ 2009-03-28 22:18 ` jamespetts
2009-03-28 22:21 ` Sverre Rabbelier
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-28 22:18 UTC (permalink / raw)
To: git
Thank you for replying again so soon :-)
I tried using the exact command that you gave me earlier, but got the identical error:
git: 'svn' is not a git-command. See 'git --help'.
On Sat, Mar 28, 2009 at 14:46, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
>
> Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
>
>
> On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>>
>> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>>
>> Any suggestions about how to deal with the other problem?
>>
>
> It looks like GitHub won't keep the project in sync for you, so you're
> probably best off doing the git-svn clone yourself, and maintaining it
> that way.
>
> http://github.com/guides/import-from-subversion
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
You should be able to use the exact command I showed earlier within
"git bash". Also, you'd want to type "git help svn", not "svn --help"
to see the manual.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550633.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 22:18 ` jamespetts
@ 2009-03-28 22:21 ` Sverre Rabbelier
2009-03-29 10:51 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-28 22:21 UTC (permalink / raw)
To: jamespetts; +Cc: git
Heya,
On Sat, Mar 28, 2009 at 23:18, jamespetts <jamespetts@yahoo.com> wrote:
> git: 'svn' is not a git-command. See 'git --help'.
Try updating to the latest snapshot, git shipped without svn on
windows for a few releases.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-28 22:21 ` Sverre Rabbelier
@ 2009-03-29 10:51 ` jamespetts
2009-03-29 11:03 ` Sverre Rabbelier
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-29 10:51 UTC (permalink / raw)
To: git
Thank you for your reply :-) I updated, and was able to get the git svn command to work, using the syntax described in a previous post.
However, after several hours of downloading (I left it overnight), it gave the error, "The connection was aborted: Can't read from connection: The connection was aborted at C:\Program Files\Git/libexec/git-core/git-svn/ line 2490".
When I look at my repository on Github, it is still empty, apart from the empty README file that I created just to initialise it. Why would it be going wrong? How do I deal with that?
Heya,
On Sat, Mar 28, 2009 at 23:18, jamespetts <jamespetts@yahoo.com> wrote:
> git: 'svn' is not a git-command. See 'git --help'.
Try updating to the latest snapshot, git shipped without svn on
windows for a few releases.
--
Cheers,
Sverre Rabbelier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2552153.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 10:51 ` jamespetts
@ 2009-03-29 11:03 ` Sverre Rabbelier
2009-03-29 11:52 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-29 11:03 UTC (permalink / raw)
To: jamespetts; +Cc: git
Heya,
On Sun, Mar 29, 2009 at 12:51, jamespetts <jamespetts@yahoo.com> wrote:
> However, after several hours of downloading (I left it overnight), it gave the error, "The connection was aborted: Can't read from connection: The connection was aborted at C:\Program Files\Git/libexec/git-core/git-svn/ line 2490".
You can continue downloading, just issue' git svn rebase' again, and
it will continue where it left of.
> When I look at my repository on Github, it is still empty, apart
> from the empty README file that I created just to initialise it.
> Why would it be going wrong? How do I deal with that?
You would have to push the repository to github regardless of whether
'git svn rebase' finished in one go. Keep in mind that' git svn
rebase' is the way to get changes _into_ your _local_ repository.
You'll need to use 'git push' to get your changes up to github.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 11:03 ` Sverre Rabbelier
@ 2009-03-29 11:52 ` jamespetts
2009-03-29 12:03 ` Sverre Rabbelier
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-29 11:52 UTC (permalink / raw)
To: git
Thank you again for your reply :-) Ahh, yes, that makes sense about the local repository. However, on checking, the local repository that I set up has no files except in .git directories - is that to be expected at this stage?
Also, when I tried "git svn rebase", I got the following error:
"Migrating from a git-svn v1 layout...
"Data from a previous version exists, but .git/svn (required for this version (1.6.2 msysgit.0.186.gf7512) of git-svn) does not exist. Done migrating from a git-svn v1 layout
"Unable to determine upstream SVN information from working tree history"
And the local directories for the repositories are still empty. Am I doing something wrong...?
Heya,
On Sun, Mar 29, 2009 at 12:51, jamespetts <jamespetts@yahoo.com> wrote:
> However, after several hours of downloading (I left it overnight), it gave the error, "The connection was aborted: Can't read from connection: The connection was aborted at C:\Program Files\Git/libexec/git-core/git-svn/ line 2490".
You can continue downloading, just issue' git svn rebase' again, and
it will continue where it left of.
> When I look at my repository on Github, it is still empty, apart
> from the empty README file that I created just to initialise it.
> Why would it be going wrong? How do I deal with that?
You would have to push the repository to github regardless of whether
'git svn rebase' finished in one go. Keep in mind that' git svn
rebase' is the way to get changes _into_ your _local_ repository.
You'll need to use 'git push' to get your changes up to github.
--
Cheers,
Sverre Rabbelier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2552334.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 11:52 ` jamespetts
@ 2009-03-29 12:03 ` Sverre Rabbelier
2009-03-29 12:08 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-29 12:03 UTC (permalink / raw)
To: jamespetts; +Cc: git
Heya,
[it is customary on this list not to top post and to reply in-line,
like I'm doing now]
On Sun, Mar 29, 2009 at 13:52, jamespetts <jamespetts@yahoo.com> wrote:
> Also, when I tried "git svn rebase", I got the following error:
> And the local directories for the repositories are still empty. Am I doing something wrong...?
You need to do something like 'git reset --hard trunk' on the master
branch, after which you can use 'git svn rebase'. This is needed the
first time only so that git svn can then figure out where you're at
from the commit messages.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:03 ` Sverre Rabbelier
@ 2009-03-29 12:08 ` jamespetts
2009-03-29 12:35 ` Sverre Rabbelier
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-29 12:08 UTC (permalink / raw)
To: git
Heya,
[it is customary on this list not to top post and to reply in-line,
like I'm doing now]
Ohh, terribly sorry - didn't realise.
On Sun, Mar 29, 2009 at 13:52, jamespetts <jamespetts@yahoo.com> wrote:
> Also, when I tried "git svn rebase", I got the following error:
> And the local directories for the repositories are still empty. Am I doing something wrong...?
You need to do something like 'git reset --hard trunk' on the master
branch, after which you can use 'git svn rebase'. This is needed the
first time only so that git svn can then figure out where you're at
from the commit messages.
Thank you for that suggestion :-) Unfortunately, "git reset --hard trunk" produced the following error:
"fatal: ambiguous argument 'trunk': unknown revision or path not in the working tree.
"use '--' to separate paths from revisions".
What am I doing wrong this time...?
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2552369.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:08 ` jamespetts
@ 2009-03-29 12:35 ` Sverre Rabbelier
2009-03-29 12:53 ` jamespetts
0 siblings, 1 reply; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-29 12:35 UTC (permalink / raw)
To: jamespetts; +Cc: git
Heya,
On Sun, Mar 29, 2009 at 14:08, jamespetts <jamespetts@yahoo.com> wrote:
> "fatal: ambiguous argument 'trunk': unknown revision or path not in the working tree.
>
> "use '--' to separate paths from revisions".
>
> What am I doing wrong this time...?
You can do "git branch -a" to see which branch name git svn uses, it
might be 'git-svn', it depends on which version you're using I think.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:35 ` Sverre Rabbelier
@ 2009-03-29 12:53 ` jamespetts
2009-03-29 12:55 ` Sverre Rabbelier
0 siblings, 1 reply; 22+ messages in thread
From: jamespetts @ 2009-03-29 12:53 UTC (permalink / raw)
To: git
Heya,
On Sun, Mar 29, 2009 at 14:08, jamespetts <jamespetts@yahoo.com> wrote:
> "fatal: ambiguous argument 'trunk': unknown revision or path not in the working tree.
>
> "use '--' to separate paths from revisions".
>
> What am I doing wrong this time...?
You can do "git branch -a" to see which branch name git svn uses, it
might be 'git-svn', it depends on which version you're using I think.
Thank you for the suggestion - the first part seemed to work: once I got the correct name, "...reset --hard" responded with:
"HEAD is now at 4939935 first commit".
However, when I tried "git svn rebase" again, I still got this error:
"Unable to determine upstream SVN infromation from working tree history".
Have I done something wrong...?
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2552470.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:53 ` jamespetts
@ 2009-03-29 12:55 ` Sverre Rabbelier
2009-03-29 15:07 ` jamespetts
2009-03-29 22:16 ` Eric Wong
0 siblings, 2 replies; 22+ messages in thread
From: Sverre Rabbelier @ 2009-03-29 12:55 UTC (permalink / raw)
To: jamespetts, Eric Wong; +Cc: git
Heya,
On Sun, Mar 29, 2009 at 14:53, jamespetts <jamespetts@yahoo.com> wrote:
>
> "Unable to determine upstream SVN infromation from working tree history".
>
> Have I done something wrong...?
I'm afraid this is where my git-svn knowledge is no longer sufficient
:(. I have had the same problem myself, and I don't know how to fix
it, perhaps Eric has a moment to enlighten?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:55 ` Sverre Rabbelier
@ 2009-03-29 15:07 ` jamespetts
2009-03-29 22:16 ` Eric Wong
1 sibling, 0 replies; 22+ messages in thread
From: jamespetts @ 2009-03-29 15:07 UTC (permalink / raw)
To: git
Heya,
On Sun, Mar 29, 2009 at 14:53, jamespetts <jamespetts@yahoo.com> wrote:
>
> "Unable to determine upstream SVN infromation from working tree history".
>
> Have I done something wrong...?
I'm afraid this is where my git-svn knowledge is no longer sufficient
:(. I have had the same problem myself, and I don't know how to fix
it, perhaps Eric has a moment to enlighten?
Supposing that Eric is unable to find a solution - would there be any mileage in doing it manually? That is, checking out the SVN repository into a local directory, initialising that as a Git repository, and then pushing it to Github? If so, would that make it any harder to re-synchronise with my branch than the git-svn method?
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2552797.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
2009-03-29 12:55 ` Sverre Rabbelier
2009-03-29 15:07 ` jamespetts
@ 2009-03-29 22:16 ` Eric Wong
1 sibling, 0 replies; 22+ messages in thread
From: Eric Wong @ 2009-03-29 22:16 UTC (permalink / raw)
To: jamespetts; +Cc: Sverre Rabbelier, git
Sverre Rabbelier <srabbelier@gmail.com> wrote:
> Heya,
>
> On Sun, Mar 29, 2009 at 14:53, jamespetts <jamespetts@yahoo.com> wrote:
> >
> > "Unable to determine upstream SVN infromation from working tree history".
> >
> > Have I done something wrong...?
>
> I'm afraid this is where my git-svn knowledge is no longer sufficient
> :(. I have had the same problem myself, and I don't know how to fix
> it, perhaps Eric has a moment to enlighten?
What does "git log" in your working tree say before you run "git svn
rebase"?
Then, what does "git log <ref_of_svn_remote_you_reset_to>" say?
"git svn rebase" relies on the "git-svn-id:" line in the log message
as well as the stored checksum to determine how to rebase the
current HEAD.
However, "git svn fetch" should always work[1] and not touch the current
HEAD. You can run "git svn fetch" to get the new updates and then
push your remotes out as heads by setting up your pushes to github
like this .git/config (totally untested):
[remote "github"]
url = user@github.com/foo/bar.git
push = refs/remotes/*:refs/heads/*
[1] - at least on POSIX, I don't know if git-svn is still broken
in Windows and can't help if is.
--
Eric Wong
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2009-03-29 22:18 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-28 13:11 Fork of abandoned SVN mirror - how to keep up to date with the SVN jamespetts
2009-03-28 16:22 ` Jacob Helwig
2009-03-28 16:46 ` jamespetts
2009-03-28 18:02 ` Jacob Helwig
2009-03-28 18:06 ` jamespetts
2009-03-28 20:27 ` Jacob Helwig
2009-03-28 21:46 ` jamespetts
2009-03-28 21:55 ` Sverre Rabbelier
2009-03-28 22:01 ` jamespetts
2009-03-28 22:04 ` Jacob Helwig
2009-03-28 22:18 ` jamespetts
2009-03-28 22:21 ` Sverre Rabbelier
2009-03-29 10:51 ` jamespetts
2009-03-29 11:03 ` Sverre Rabbelier
2009-03-29 11:52 ` jamespetts
2009-03-29 12:03 ` Sverre Rabbelier
2009-03-29 12:08 ` jamespetts
2009-03-29 12:35 ` Sverre Rabbelier
2009-03-29 12:53 ` jamespetts
2009-03-29 12:55 ` Sverre Rabbelier
2009-03-29 15:07 ` jamespetts
2009-03-29 22:16 ` Eric Wong
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 NNTP newsgroup(s).