threads / discuss / 18492

git svn teething problems - initial clone okay - fetches not working

Subject: git svn teething problems - initial clone okay - fetches not working

## tl;dr

9 messages between Mar 23, 2009 and Mar 24, 2009.

replies: 8people: 3as markdown or json

Aaron Gray· Mar 23, 2009, 19:06 UTC · lore

Hi,

I am a newbie to git, so be warned :)

I have installed git-daemon, and gitweb on an F10 server.

Basically managed to do a 'git svn clone' on LLVM, it took 11 hours !

Anyway I am having the problem that I can do a 'git svn fetch' and I see changes coming in. But the gitweb and another git clone from it do not reflect those changes. The repository is still showing its two days old.

I am obviously missing something. The only documentation I could find on 'git svn' was the command line help and 'man git-svn'.

Hope you can help,

Aaron

Tim Visher· Mar 23, 2009, 19:43 UTC · re: Aaron Gray · lore

Re: git svn teething problems - initial clone okay - fetches not working

I had a lot of success when I was more actively using `git svn` with `git svn rebase`. Just be sure that you're doing your work in local branches and then merging back into the main trunk branches that are tracking the svn repo, that way you can always get the latest changes from your clean trunk branch.

On Mon, Mar 23, 2009 at 3:30 PM, Aaron Gray <aaronngray.lists@googlemail.com> wrote:

Show 24 quoted lines

> Hi,
>
> I am a newbie to git, so be warned :)
>
> I have installed git-daemon, and gitweb on an F10 server.
>
> Basically managed to do a 'git svn clone' on LLVM, it took 11 hours !
>
> Anyway I am having the problem that I can do a 'git svn fetch' and I see
> changes coming in. But the gitweb and another git clone from it do not
> reflect those changes. The repository is still showing its two days old.
>
> I am obviously missing something. The only documentation I could find on
> 'git svn' was the command line help and 'man git-svn'.
>
> Hope you can help,
>
> Aaron
>
> --
> 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
>

-- 
In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail

Aaron Gray· Mar 23, 2009, 19:53 UTC · re: Tim Visher · lore

Re: git svn teething problems - initial clone okay - fetches not working

Show 5 quoted lines

>I had a lot of success when I was more actively using `git svn` with
>`git svn rebase`.  Just be sure that you're doing your work in local
>branches and then merging back into the main trunk branches that are
>tracking the svn repo, that way you can always get the latest changes
>from your clean trunk branch.

I tried a rebase and filenames with 'needs update' after them flew by then an error message :-

update-index --refresh: command returned error: 1

Aaron

On Mon, Mar 23, 2009 at 3:30 PM, Aaron Gray <aaronngray.lists@googlemail.com> wrote:

Show 24 quoted lines

> Hi,
>
> I am a newbie to git, so be warned :)
>
> I have installed git-daemon, and gitweb on an F10 server.
>
> Basically managed to do a 'git svn clone' on LLVM, it took 11 hours !
>
> Anyway I am having the problem that I can do a 'git svn fetch' and I see
> changes coming in. But the gitweb and another git clone from it do not
> reflect those changes. The repository is still showing its two days old.
>
> I am obviously missing something. The only documentation I could find on
> 'git svn' was the command line help and 'man git-svn'.
>
> Hope you can help,
>
> Aaron
>
> --
> 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
>

-- 
In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail

Pascal Obry· Mar 23, 2009, 21:03 UTC · re: Aaron Gray · lore

Re: git svn teething problems - initial clone okay - fetches not working

Aaron Gray a écrit :

> Anyway I am having the problem that I can do a 'git svn fetch' and I see
> changes coming in. But the gitweb and another git clone from it do not
> reflect those changes. The repository is still showing its two days old.

You need a:

   $ git svn rebase

to fetch *and* merge the changes into the local tracking branch (master by default).

Pascal.

-- 
--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B

Aaron Gray· Mar 23, 2009, 21:10 UTC · re: Pascal Obry · lore

Re: git svn teething problems - initial clone okay - fetches not working

Show 8 quoted lines

> Aaron Gray a écrit :
>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>> changes coming in. But the gitweb and another git clone from it do not
>> reflect those changes. The repository is still showing its two days old.
>
> You need a:
>
>   $ git svn rebase

I tried that.

> to fetch *and* merge the changes into the local tracking branch (master
> by default).

Pascal,

Could you give me a full set of instructions for importing :-

    http://llvm.org/svn/llvm-project/llvm

Thanks,

Aaron

Tim Visher· Mar 23, 2009, 21:58 UTC · re: Aaron Gray · lore

Re: git svn teething problems - initial clone okay - fetches not working

On Mon, Mar 23, 2009 at 5:31 PM, Aaron Gray <aaronngray.lists@googlemail.com> wrote:

Show 21 quoted lines

>> Aaron Gray a écrit :
>>>
>>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>>> changes coming in. But the gitweb and another git clone from it do not
>>> reflect those changes. The repository is still showing its two days old.
>>
>> You need a:
>>
>>  $ git svn rebase
>
> I tried that.
>
>> to fetch *and* merge the changes into the local tracking branch (master
>> by default).
>
> Pascal,
>
> Could you give me a full set of instructions for importing :-
>
>   http://llvm.org/svn/llvm-project/llvm
>

It sounds like your working directory might be dirty. Are you sure all of your changes have been committed?

-- 
In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail

Aaron Gray· Mar 23, 2009, 22:03 UTC · re: Tim Visher · lore

Re: git svn teething problems - initial clone okay - fetches not working

On Mon, Mar 23, 2009 at 5:31 PM, Aaron Gray <aaronngray.lists@googlemail.com> wrote:

Show 21 quoted lines

>> Aaron Gray a écrit :
>>>
>>> Anyway I am having the problem that I can do a 'git svn fetch' and I see
>>> changes coming in. But the gitweb and another git clone from it do not
>>> reflect those changes. The repository is still showing its two days old.
>>
>> You need a:
>>
>>  $ git svn rebase
>
> I tried that.
>
>> to fetch *and* merge the changes into the local tracking branch (master
>> by default).
>
> Pascal,
>
> Could you give me a full set of instructions for importing :-
>
>   http://llvm.org/svn/llvm-project/llvm
>

   It sounds like your working directory might be dirty.  Are you sure
   all of your changes have been committed?

Probably. I am getting an error on doing 'git svn rebase' :-

many filenames * : needs update update---index --refresh: command returned error: 1

Could you please give me the command to import the above SVN repository so I can redo the thing from scratch.

Many thanks in advance,

Aaron

Pascal Obry· Mar 24, 2009, 06:41 UTC · re: Aaron Gray · lore

Re: git svn teething problems - initial clone okay - fetches not working

Aaron Gray a écrit :

> Probably. I am getting an error on doing 'git svn rebase' :-
> 
> many filenames * : needs update
> update---index --refresh: command returned error: 1

So before the rebase try:

   $ git reset --hard HEAD

then

   $ git svn rebase

> Could you please give me the command to import the above SVN repository
> so I can redo the thing from scratch.

What you have done (at least described here in this forum) seems correct.

Pascal.

-- 
--|------------------------------------------------------
--| Pascal Obry                           Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--|    http://www.obry.net  -  http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B

Tim Visher· Mar 24, 2009, 11:45 UTC · re: Pascal Obry · lore

Re: git svn teething problems - initial clone okay - fetches not working

On Tue, Mar 24, 2009 at 2:41 AM, Pascal Obry <pascal@obry.net> wrote:

Show 14 quoted lines

> Aaron Gray a écrit :
>> Probably. I am getting an error on doing 'git svn rebase' :-
>>
>> many filenames * : needs update
>> update---index --refresh: command returned error: 1
>
> So before the rebase try:
>
>   $ git reset --hard HEAD
>
> then
>
>   $ git svn rebase
>

To be clear, this will destroy any non-committed changes in your working copy so if you in fact are erroneously getting those errors because you forgot to do a `git add .; git commit` on files you've changed that you _meant_ to change, then you will lose those changes. What's the output of `git status`?

-- 
In Christ,

Timmy V.

http://burningones.com/
http://five.sentenc.es/ - Spend less time on e-mail