[Adeos-main] Re: [RFC] git workflow

[Jan Kiszka <jan.kiszka@domain.hid>]

Jan Kiszka wrote:
> ...
> [Keeping up-to-date]
>  1. The original kernel tree may have been updated, and the ipipe patch
>     needs to be rebased
> 
>     # git fetch
>     # git rebase origin

I meanwhile learned that rebasing doesn't work well with public git
tree. Once you pushed some tree, say, linux-2.6.19 + ipipe-patch1..n
out, you cannot rebase to 2.6.20 + ipipe-patch1..n without breaking the
linear history.

Either we only push out final trees (but that would lock-out early
testers that may want to pull from devel-head), or we need to evolve
with ipipe patches deeply merged. That means when we have 2.6.19 + ipipe
cleanly on top of it, pulling 2.6.20 origin may cause conflicts (like
the paravirt stuff does on i386 ATM). We would then have to merge the
upstream patches into the I-pipe tree, effectively adopting them to
I-pipe. An extraction of a potential I-pipe patch stack would be more
complicated that way, but not infeasible.

Comments?

Jan