On 08/05/2010 10:54 PM, Brian Aker wrote: > Hi! > > I thought I would explain a few more bits about merges. > > Lets say you have patches 23,24,25 in your local tree. Just push > them to build. As long as none of them fail you are ready for > staging. > > For staging I typically do a rollup of the three. So they will all > become "23" with subrevision numbers (if you are ever worried that > the rollup to staging has something that has not full gone through > build, read the comments for uniqueness). The valgrind report should > always be the indicator of whether or not something should move to > staging (ie you can look at it and see if the latest passed or not). > > > Once you have a rollup in "staging" you can push another set to > build. Are there any issues with this?
This is exactly the process I've been using as well. So I agree. > If staging fails you will have to over write anything you pushed > after the rollup you pushed to staging. So you risk doing wasted > work, but normally it is not a lot of wasted work. > > Is there anything that shouldn't be rolled up? > > Yes. If you have a major patch, something that touches a lot of files > (lets call it 10+ ), unless it is just a simple "rename" patch, you > should probably run it through the system by itself. I would also > recommend that for the most part if you have a stack of Stewart's > patches that are just for the embedded engine, I would just put them > in one merge. > > Should you ever use the build tree to fix a patch? IE build is broken > and you want to push a "fix" for it. I would try to keep this to a > minimum. For instance it is ok if it is a build related item. > Valgrind/etc should probably be fixed in local trees. I've made the > mistake plenty of times of trying to fix in build, it typically does > not work. ++ I probably do this more than most folks - but usually due to build issues. > What about helping someone out? > > I think it would be nice if others could promote it (we all go out to > eat, have other things to do, etc...). My only concern is that this > could be confusing. I've felt comfortable sometimes doing this in the > last week, and I know that I have sometimes not. I am also aware that > it can make someone feel "well, they were going to do it...". So I > would love to hear other people's thoughts on it. Personally I like > to see stuff moving through as quickly as possible, but there is a > balance in this as well. > > Thoughts? Sounds right on to me. Monty _______________________________________________ Mailing list: https://launchpad.net/~drizzle-merge Post to : [email protected] Unsubscribe : https://launchpad.net/~drizzle-merge More help : https://help.launchpad.net/ListHelp
