On Thu, Apr 07, 2005 at 10:05:28PM -0400, Alan Stern wrote: > > > > Or, if Greg has incremental patch usb1-to-usb2.patch. > > You can "quilt pop" to reach "rc2-usb1", then "quilt fold < > > usb1-to-usb2.patch". > > So you have usb2 now. > > > > Do "quilt push" again to your continue "usb-hack" development. > > You missed the point of my earlier question, however. What happens when > Greg releases 2.6.12-rc3-usb1.patch? Now all of a sudden my script > doesn't work. It will try to pop back to Linus's -rc2 patch and then > apply Greg's new patch, which will fail dismally. I will need to > intervene by hand (or else write a smarter script).
I see. Because there rc3-usb1 and rc2-usb2 is on different base. You can't do clean rc2-usb2-to-rc3-usb1.patch unless you include the rc2-rc3 change. So what I should do is pop to 2.6.12-rc2 patch, fold in the the rc2-to-rc3.patch. Then modify the next patch to be rc3-usb1.patch. Of course, some smarter script can be written. > > I don't believe that. Or rather, I don't believe Greg's cumulative patch > files will contain correct copies of all the individual patches. Greg's > script produces several cumulative patch files by applying different > subsets of his complete series. What happens when patches in two > different subsets touch the same part of the same source file? By only > applying the patches in one subset his script is guaranteed to get a patch > failure. Yes, and it will fail on Greg's make_patches when it try to cherry-pick the patches, hopefully don't need to see that. What happen on the old BK module in that case, Greg? Having different bk tree for different project and merge them to become the usb bk tree? Chris ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ linux-usb-devel@lists.sourceforge.net To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
