Hi, > -----Original Message----- > From: Doyu Hiroshi (Nokia-D/Helsinki) > Sent: Friday, April 09, 2010 5:58 PM > To: [email protected] > Cc: [email protected]; Zabaluev Mikhail (Nokia-D/Helsinki) > Subject: Re: [MeeGo-dev] why do not the patches work well ?? > > > > > Question 3: why do people have to fiddle with patches when it's a git > > > > repository, and as such it can just have branches? > > > > > So that one can trace where the code comes from. > > > > I did write "it's a git repository". > > Experimentally, I have imported all patches from "kernel-source.git" > with "git quiltimport" as below, This may be somewhat different from > the way kernel-source.git expects, but it gives some picture of what > kernel-source.git provides right now.
Good. Note that with your imported-patches branch, you can: 1) Immediately see when the upstream tree has diverged so that the patches cannot be cleanly applied -- something that maintainers of the Meego kernel source repository apparently failed to notice at the time when this thread has originated; 2) Resolve the conflicts and record your resolution, retaining all the preceding change history. Many of the patches are in fact commits in various git repositories, so it makes sense to import them directly without losing a lot of context. Others can just be dumped into the Meego repository with origin mentioned in the description. The only problem I see with this approach is maintaining the separation between pristine source and patches in the rpm package. But it could be automatically reconstructed when given references to git branches or tags. Gir, anyone? Best regards, Mikhail _______________________________________________ MeeGo-dev mailing list [email protected] http://lists.meego.com/listinfo/meego-dev
