net-2.6.25 being rebased...

net-2.6.25 being rebased...

[David Miller]

I want to work out all the conflicts now that Linus has pulled
in my most recent batch of fixes.

I hope to have it done in the next hour or so.

Thanks.

Re: net-2.6.25 being rebased...

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Tue, 11 Dec 2007 09:26:38 -0800 (PST)

> I want to work out all the conflicts now that Linus has pulled
> in my most recent batch of fixes.
> 
> I hope to have it done in the next hour or so.

The rebase of net-2.6.25 is complete, sorry for taking
so long.

Re: net-2.6.25 being rebased...

[Joe Perches]

On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
> The rebase of net-2.6.25 is complete

I have an earlier unmodified git repository of net-2.6.25.
Does anyone know the appropriate git commands to resync
to the rebased content?

$ git branch
* master
$ git-pull
[...]
Automatic merge failed; fix conflicts and then commit the result.

Re: net-2.6.25 being rebased...

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Tue, 11 Dec 2007 13:04:59 -0800

> On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
> > The rebase of net-2.6.25 is complete
> 
> I have an earlier unmodified git repository of net-2.6.25.
> Does anyone know the appropriate git commands to resync
> to the rebased content?
> 
> $ git branch
> * master
> $ git-pull
> [...]
> Automatic merge failed; fix conflicts and then commit the result.

Easiest thing to do is do a quick local clone of Linus's current tree
(you do have one of these around right? :-) and then pull in from the
rebased tree.

bash$ git clone linux-2.6/.git net-2.6.25
bash$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git

Re: net-2.6.25 being rebased...

[Arnaldo Carvalho de Melo]

Em Tue, Dec 11, 2007 at 01:04:59PM -0800, Joe Perches escreveu:
> On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
> > The rebase of net-2.6.25 is complete
> 
> I have an earlier unmodified git repository of net-2.6.25.
> Does anyone know the appropriate git commands to resync
> to the rebased content?
> 
> $ git branch
> * master
> $ git-pull
> [...]
> Automatic merge failed; fix conflicts and then commit the result.

rm -rf net-2.6.25
git-clone --reference linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

Assuming you have linux-2.6 cloned from Linus.

Dave may have removed patches, combined some, whatever, so I just do the
above procedure when I don't have any pending csets on my local
net-2.6.25 tree.

- Arnaldo

Re: net-2.6.25 being rebased...

[Joe Perches]

On Tue, 2007-12-11 at 19:09 -0200, Arnaldo Carvalho de Melo wrote:
> git-clone --reference linux-2.6 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

That works well. Just ~3MB in objects downloaded. Thanks.

Re: net-2.6.25 being rebased...

[Kok, Auke]

David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Tue, 11 Dec 2007 13:04:59 -0800
> 
>> On Tue, 2007-12-11 at 11:56 -0800, David Miller wrote:
>>> The rebase of net-2.6.25 is complete
>> I have an earlier unmodified git repository of net-2.6.25.
>> Does anyone know the appropriate git commands to resync
>> to the rebased content?
>>
>> $ git branch
>> * master
>> $ git-pull
>> [...]
>> Automatic merge failed; fix conflicts and then commit the result.
> 
> Easiest thing to do is do a quick local clone of Linus's current tree
> (you do have one of these around right? :-) and then pull in from the
> rebased tree.
> 
> bash$ git clone linux-2.6/.git net-2.6.25
> bash$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git

I often have success without recloning by doing:

$ git-reset --hard v2.6.23
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git

saves you the time to reclone. As long as you reset below the rebase point, this
should be OK.

Auke

Re: net-2.6.25 being rebased...

[Francois Romieu]

Joe Perches <joe@perches.com> :
[...]
> I have an earlier unmodified git repository of net-2.6.25.
> Does anyone know the appropriate git commands to resync
> to the rebased content?
> 
> $ git branch
> * master
> $ git-pull
> [...]
> Automatic merge failed; fix conflicts and then commit the result.

Assuming taht you initially cloned from davem's repo, your .git/config
could contain something along the lines of:

 [remote "origin"]
         url = git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
         fetch = +refs/heads/*:refs/remotes/origin/*

(the "+" will update even non fast-forwarding branches)

Then:

$ git fetch origin
$ git fetch -u remotes/origin/master:master

You may then reset --hard to wipe out any leftover file.

If you cloned from somewhere else, replace "origin" with the label of
your choice to automate the process.

-- 
Ueimor

Re: net-2.6.25 being rebased...

[Francois Romieu]

Francois Romieu <romieu@fr.zoreil.com> :
[...]
>  [remote "origin"]
>          url = git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
                                                                     ^^^^^^^
"net-2.6.25", sorry.

While reading the answers, I have the strange feeling that "remotes"
branches are not advertised a lot.

-- 
Ueimor