Hi Peter, * Peter Rosin wrote on Mon, Jan 19, 2009 at 09:52:50PM CET: > Den 2009-01-19 21:35 skrev Ralf Wildenhues: >> >> I think we shouldn't be constantly rebasing pr-msvc-support. I think >> instead when we can't decide soonish whether to merge it into master or >> to redo it (because it would need largish redoing), then you should just >> merge from master into the branch in order to keep it up to date. > > I had no plan to rebase anything, what I was suggesting was to maybe > push it to the branch now (if it wasn't clear that it was safe for > master), then when someone said "ok", I could cherry-pick it into > master.
With respect to being smart about merges, and knowing what's already been added to master, cherry-picking isn't any better than rebasing. Only merging is. And currently we are not using that to our advantage. > (But the last four patches on the branch are not very pretty, dates > are all messed up, no Changelog entries, crappy commit msgs etc etc. > Those should be merged with care.) Sure. Cheers, Ralf
