What is the best way to rebase against linux-next

[Tim Gardner]

Andy Whitcroft wrote:
> On Wed, Apr 29, 2009 at 09:31:44AM -0600, Tim Gardner wrote:
> 
>> I've been experimenting with keeping ubuntu-next up to date with
>> linux-next, but I'm having some problems getting a clean rebase while
>> still preserving some local changes (such as the commit that adds the
>> debian directory).
>>
>> This is what I'm doing:
>>
>> git remote add next
>> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
>> git fetch next
>> git rebase next/master
>>
>> The rebase conflicts frequently (as you might expect), so I just 'git
>> rebase --skip' thinking that this performs the upstream commit and drops
>> the local conflicting commit. At the end of the process I compared the 2
>> trees and found some differences that I did not expect. Any thoughts?
> 
> I would have expected a skip to drop that commit and leave the tree
> clean, must as you seem to.  What sort of conflicts are you seeing when
> you do this?  It sounds like you are losing the debian directory which
> seems unexpected.
> 
> -apw

Actually, the debian directory was left as I would have expected.
Because I'm compulsive I did a full tree diff and found a few, but
significant, differences other then the debian directory. As far as I'm
concerned, at that point it should have been a perfect match.

rtg
-- 
Tim Gardner tim.gardner at canonical.com