Karel Zak (kzak@redhat.com) said:
My wish is "git rebase" always after upgrade to new upstream code. The current "make prep" is nightmare...
See Linux kernel. That's normal that people maintain their patches outside official tree(s) for pretty long time. The modern VCS is the right tool for this job.
"separate out our changes from what upstream has" .. is definitely no problem.
Well, it depends on what you're doing. DaveJ tried to move to git pulling the various things we need for our kernel - it ended up being a pretty big problem getting something sane out of it, and he ended up going back to patches.
Bill