Thread: [SSI-devel] Merging changes from RH branch back to vanilla tree.
Brought to you by:
brucewalker,
rogertsang
From: Aneesh K. K.V <ane...@di...> - 2003-04-23 15:32:58
|
Hi All, I tried last two days trying to merge the changes from RH branch and found that it is not a simple task at all. More difficult if one doesn't have an understanding about the subsystem that is getting modified. Are we planning to merge the changes back from RH branch. If yes how frequent ? In case of merging we can make it less time consuming by following something as below . What do you guys think ? Is it going to take more time out of development activity ? 1) Main bug-fixes and enhancements happen in RH branch 2) As developers find free time they merge the changes back to vanilla tree. This should be easy for who ever made the changes/enhancement since that person knows the code better. This can happen once in two weeks. The developer just make sure that things builds and logically follow the correct code sequence. 3) Meanwhile people interested in vanilla tree can checkout the code and try building the kernel themselves. 4) people can send the patches if the build fails or if they find some problems associated with cvs code base, which get committed to the cvs by developers. -aneesh |
From: Brian J. W. <Bri...@hp...> - 2003-05-08 23:54:18
|
Aneesh Kumar K.V wrote: > In case of merging we can make it less time consuming by following > something as below . What do you guys think ? Is it going to take more > time out of development activity ? > > 1) Main bug-fixes and enhancements happen in RH branch > > 2) As developers find free time they merge the changes back to vanilla > tree. This should be easy for who ever made the changes/enhancement > since that person knows the code better. This can happen once in two > weeks. The developer just make sure that things builds and logically > follow the correct code sequence. This will certainly take a little more development time, but it seems reasonable to me. At least it avoids the time-consuming chore of doing runtime testing on both RH and the trunk. It seems like John and Laura have been following this approach already. Brian |